diff --git a/autobahn/asyncio/websocket.py b/autobahn/asyncio/websocket.py index aa16389e5..4d83caf0c 100644 --- a/autobahn/asyncio/websocket.py +++ b/autobahn/asyncio/websocket.py @@ -28,6 +28,9 @@ from collections import deque +import txaio +txaio.use_asyncio() + from autobahn.wamp import websocket from autobahn.websocket import protocol @@ -43,7 +46,6 @@ from trollius import Future from autobahn.websocket.types import ConnectionDeny -import txaio __all__ = ( diff --git a/autobahn/wamp/test/test_protocol_peer.py b/autobahn/wamp/test/test_protocol_peer.py index 68446b0b8..b074f8ad9 100644 --- a/autobahn/wamp/test/test_protocol_peer.py +++ b/autobahn/wamp/test/test_protocol_peer.py @@ -25,6 +25,16 @@ ############################################################################### from __future__ import absolute_import +import os + +# we need to select a txaio subsystem because we're importing the base +# protocol classes here for testing purposes. "normally" you'd import +# from autobahn.twisted.wamp or autobahn.asyncio.wamp explicitly. +import txaio +if os.environ.get('USE_TWISTED', False): + txaio.use_twisted() +else: + txaio.use_asyncio() from autobahn import wamp from autobahn.wamp import message