Skip to content

explicit .use_asyncio() in right spot #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 3, 2015
+13 −1
Merged

explicit .use_asyncio() in right spot #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09250ee
explicit .use_asyncio() in right spot
meejah Dec 2, 2015
e2a3d7b
select txaio subsystem in 'base' tests
meejah Dec 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion autobahn/asyncio/websocket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@

from collections import deque

import txaio
txaio.use_asyncio()

from autobahn.wamp import websocket
from autobahn.websocket import protocol

Expand All @@ -43,7 +46,6 @@
from trollius import Future

from autobahn.websocket.types import ConnectionDeny
import txaio


__all__ = (
Expand Down
10 changes: 10 additions & 0 deletions autobahn/wamp/test/test_protocol_peer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down