From 6955ec88c1ffbad0a9c76ba74e9fb00677e85cbd Mon Sep 17 00:00:00 2001
From: meejah <meejah@meejah.ca>
Date: Fri, 27 Nov 2015 11:41:46 -0700
Subject: [PATCH] Make all twisted-using import paths call txaio.use_twisted

Could be related to #547
---
 autobahn/twisted/choosereactor.py | 13 ++++---------
 autobahn/twisted/websocket.py     |  5 +++--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/autobahn/twisted/choosereactor.py b/autobahn/twisted/choosereactor.py
index 2afb53ffc..1cc25d2c9 100644
--- a/autobahn/twisted/choosereactor.py
+++ b/autobahn/twisted/choosereactor.py
@@ -28,7 +28,8 @@
 
 import traceback
 
-from txaio import make_logger
+import txaio
+txaio.use_twisted()
 
 __all__ = (
     'install_optimal_reactor',
@@ -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
     ##
@@ -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
diff --git a/autobahn/twisted/websocket.py b/autobahn/twisted/websocket.py
index d2476b8f6..7a01a8e8a 100644
--- a/autobahn/twisted/websocket.py
+++ b/autobahn/twisted/websocket.py
@@ -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
@@ -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, \