Remove unittest2 use

tests/init_tests.py

@@ -3,10 +3,7 @@ Tests for functionality in the __init__.py module
 """
 import platform
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import queries

tests/integration_tests.py

@@ -23,6 +23,9 @@ class SessionIntegrationTests(URIMixin, unittest.TestCase):
         except queries.OperationalError as error:
             raise unittest.SkipTest(str(error).split('\n')[0])
+    def tearDown(self):
+        self.session.close()
+
     def test_query_returns_results_object(self):
         self.assertIsInstance(self.session.query('SELECT 1 AS value'),
                               queries.Results)

tests/pool_connection_tests.py

@@ -3,10 +3,7 @@ Tests for Connection class in the pool module
 """
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import weakref
 from queries import pool

tests/pool_exception_tests.py

@@ -2,11 +2,7 @@
 Tests for Exceptions in queries.pool
 """
-import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import uuid
 from queries import pool

tests/pool_manager_tests.py

@@ -3,10 +3,7 @@ Tests for Manager class in the pool module
 """
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import uuid
 from queries import pool

tests/pool_tests.py

@@ -4,15 +4,11 @@ Tests for functionality in the pool module
 """
 import mock
 import time
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import uuid
 from queries import pool
-
 MAX_POOL_SIZE = 100
@@ -123,7 +119,8 @@ class PoolTests(unittest.TestCase):
         obj = pool.Pool(str(uuid.uuid4()))
         psycopg2_conn = mock.Mock()
         obj.add(psycopg2_conn)
-        conn = obj._connection(psycopg2_conn)
+        self._connection = obj.connection_handle
+        conn = self._connection(psycopg2_conn)
         conn.free = mock.Mock()
         obj.free(psycopg2_conn)
         conn.free.assert_called_once_with()
@@ -132,7 +129,7 @@ class PoolTests(unittest.TestCase):
         obj = pool.Pool(str(uuid.uuid4()))
         psycopg2_conn = mock.Mock()
         obj.add(psycopg2_conn)
-        conn = obj._connection(psycopg2_conn)
+        conn = obj.connection_handle(psycopg2_conn)
         conn.free = mock.Mock()
         obj.free(psycopg2_conn)
         conn.free.assert_called_once_with()
@@ -144,7 +141,7 @@ class PoolTests(unittest.TestCase):
                                  busy=False, closed=False):
             [obj.add(conn) for conn in psycopg2_conns]
             for psycopg2_conn in psycopg2_conns:
-                conn = obj._connection(psycopg2_conn)
+                conn = obj.connection_handle(psycopg2_conn)
                 conn.free = mock.Mock()
             obj.free(psycopg2_conns[1])
             self.assertAlmostEqual(int(obj.idle_start), int(time.time()))
@@ -281,7 +278,7 @@ class PoolTests(unittest.TestCase):
         obj = pool.Pool(str(uuid.uuid4()))
         psycopg2_conn = mock.Mock()
         obj.add(psycopg2_conn)
-        self.assertEqual(obj._connection(psycopg2_conn).handle, psycopg2_conn)
+        self.assertEqual(obj.connection_handle(psycopg2_conn).handle, psycopg2_conn)
     def test_shutdown_raises_when_executing(self):
         psycopg2_conn = mock_connection()

tests/results_tests.py

@@ -3,10 +3,7 @@ Tests for functionality in the results module
 """
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import psycopg2

tests/session_tests.py

@@ -4,10 +4,7 @@ Tests for functionality in the session module
 """
 import hashlib
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 from psycopg2 import extras
 import psycopg2

tests/tornado_session_tests.py

@@ -3,10 +3,7 @@ Tests for functionality in the tornado_session module
 """
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 from psycopg2 import extras

tests/utils_tests.py

@@ -3,10 +3,7 @@ Tests for functionality in the utils module
 """
 import mock
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 from queries import utils