Clean up imports and import order

queries/session.py

@@ -27,10 +27,10 @@ import hashlib
 import logging
 import psycopg2
-from psycopg2 import extensions
-from psycopg2 import extras
-from queries import pool, results, utils, DEFAULT_URI, PYPY
+from psycopg2 import extensions, extras
+from queries import pool, results, utils
+from queries.utils import DEFAULT_URI, PYPY
 LOGGER = logging.getLogger(__name__)

queries/tornado_session.py

@@ -26,16 +26,12 @@ import logging
 import socket
 import warnings
-import psycopg2
-from psycopg2 import extras, extensions
 from tornado import concurrent, ioloop
-from queries import pool
-from queries import results
-from queries import session
-from queries import utils
-from queries import DEFAULT_URI
-from queries import PYPY
+from psycopg2 import extras, extensions
+import psycopg2
+from queries import pool, results, session, utils
+from queries.utils import DEFAULT_URI, PYPY
 LOGGER = logging.getLogger(__name__)
@@ -317,7 +313,7 @@ class TornadoSession(session.Session):
                 self._pool_manager.lock(self.pid, connection, self)
-                # Added in because psycopg2ct connects and leaves the
+                # Added in because psycopg2cffi connects and leaves the
                 # connection in a weird state: consts.STATUS_DATESTYLE,
                 # returning from Connection._setup without setting the state
                 # as const.STATUS_OK

tests/session_tests.py

@@ -6,15 +6,12 @@ import hashlib
 import mock
 import unittest
+# Out of order import to ensure psycopg2cffi is registered
+from queries import pool, results, session, PYPY
+
 from psycopg2 import extras
 import psycopg2
-from queries import pool
-from queries import results
-from queries import session
-
-from queries import PYPY
-
 class SessionTestCase(unittest.TestCase):

tests/tornado_session_tests.py

@@ -5,18 +5,11 @@ Tests for functionality in the tornado_session module
 import mock
 import unittest
-try:
-    from psycopg2cffi import extras
-except ImportError:
-    from psycopg2 import extras
-
-from tornado import concurrent
-from tornado import gen
-from tornado import ioloop
-from tornado import testing
-
-from queries import pool
-from queries import tornado_session
+# Out of order import to ensure psycopg2cffi is registered
+from queries import pool, tornado_session
+
+from psycopg2 import extras
+from tornado import concurrent, gen, ioloop, testing
 class ResultsTests(unittest.TestCase):