Skip to content

Make all twisted-using import paths call txaio.use_twisted #557

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 1 commit into from
Dec 2, 2015
Merged

Make all twisted-using import paths call txaio.use_twisted #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 4 additions & 9 deletions autobahn/twisted/choosereactor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@

import traceback

from txaio import make_logger
import txaio
txaio.use_twisted()

__all__ = (
'install_optimal_reactor',
Expand All @@ -43,14 +44,10 @@ def install_optimal_reactor(verbose=False):
:param verbose: If ``True``, print what happens.
:type verbose: bool
"""
log = make_logger()
log = txaio.make_logger()

import sys
from twisted.python import reflect
import txaio
txaio.use_twisted() # just to be sure...
# XXX should I configure txaio.config.loop in here too, or just in
# install_reactor()? (I am: see bottom of function)

# determine currently installed reactor, if any
##
Expand Down Expand Up @@ -132,10 +129,8 @@ def install_reactor(explicit_reactor=None, verbose=False):
:type verbose: bool
"""
import sys
import txaio
txaio.use_twisted() # just to be sure...

log = make_logger()
log = txaio.make_logger()

if explicit_reactor:
# install explicitly given reactor
Expand Down
5 changes: 3 additions & 2 deletions autobahn/twisted/websocket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@

from zope.interface import implementer

import txaio
txaio.use_twisted()

import twisted.internet.protocol
from twisted.internet.defer import maybeDeferred
from twisted.internet.interfaces import ITransport
Expand All @@ -42,8 +45,6 @@
from autobahn.websocket import protocol
from autobahn.twisted.util import peer2str

import txaio

from autobahn.websocket.compress import PerMessageDeflateOffer, \
PerMessageDeflateOfferAccept, \
PerMessageDeflateResponse, \
Expand Down