Add python3 support in unittests

7 files changed, 15 insertions, 20 deletions

diff --git a/funtests/config.py b/funtests/config.py
index 8e3cec4..1b95423 100644
--- a/funtests/config.py
+++ b/funtests/config.py
@@ -7,7 +7,7 @@ BROKER_USER = os.environ.get('BROKER_USER', 'guest')
 BROKER_PASSWORD = os.environ.get('BROKER_PASSWORD', 'guest')
 
 from functools import partial
-from unittest2 import TestCase
+from unittest import TestCase
 from uuid import uuid4
 
 
diff --git a/funtests/setup.py b/funtests/setup.py
index fa6f625..5116dd6 100644
--- a/funtests/setup.py
+++ b/funtests/setup.py
@@ -45,7 +45,6 @@ setup(
     build_requires=[
         "nose",
         "nose-cover3",
-        "unittest2",
         "coverage>=3.0",
     ],
     classifiers=[
diff --git a/librabbitmq/tests/test_functional.py b/librabbitmq/tests/test_functional.py
index 2dc9bd6..03d6276 100644
--- a/librabbitmq/tests/test_functional.py
+++ b/librabbitmq/tests/test_functional.py
@@ -1,8 +1,9 @@
 from __future__ import absolute_import
-from __future__ import with_statement
+
+from six.moves import xrange
 
 import socket
-import unittest2 as unittest
+import unittest
 
 from librabbitmq import Message, Connection, ConnectionError, ChannelError
 TEST_QUEUE = 'pyrabbit.testq'
@@ -86,7 +87,7 @@ class test_Channel(unittest.TestCase):
         for i in xrange(100):
             self.connection.drain_events(timeout=0.2)
 
-        self.assertEquals(len(messages), 100)
+        self.assertEqual(len(messages), 100)
 
     def test_timeout(self):
         """Check that our ``drain_events`` call actually times out if
@@ -110,7 +111,7 @@ class test_Channel(unittest.TestCase):
 
         with self.assertRaises(socket.timeout):
             self.connection.drain_events(timeout=0.1)
-        self.assertEquals(len(messages), 1)
+        self.assertEqual(len(messages), 1)
 
     def tearDown(self):
         if self.channel and self.connection.connected:
diff --git a/requirements/README.rst b/requirements/README.rst
index 1175f71..ffe49f4 100644
--- a/requirements/README.rst
+++ b/requirements/README.rst
@@ -14,10 +14,6 @@ Index
 
     Requirements needed to run the full unittest suite.
 
-* :file:`requirements/test3.txt`
-
-    Requirements needed to run the full unittest suite on Python 3.
-
 * :file:`requirements/test-ci.txt`
 
     Extra test requirements required by the CI suite (Tox).
@@ -41,12 +37,3 @@ Running the tests
 
     $ pip install -U -r requirements/default.txt
     $ pip install -U -r requirements/test.txt
-
-
-Running the tests on Python 3
------------------------------
-
-::
-
-    $ pip install -U -r requirements/default.txt
-    $ pip install -U -r requirements/test3.txt
diff --git a/requirements/default.txt b/requirements/default.txt
index 22439cb..6fa7e25 100644
--- a/requirements/default.txt
+++ b/requirements/default.txt
@@ -1 +1,2 @@
+six>=1.0.0
 amqp>=1.4.6
diff --git a/requirements/test.txt b/requirements/test.txt
index 70e6505..1f4031d 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -1,3 +1,3 @@
-unittest2>=0.4.0
 nose
 mock
+six
diff --git a/setup.py b/setup.py
index 8228d69..0b94c10 100644
--- a/setup.py
+++ b/setup.py
@@ -195,6 +195,13 @@ if 'bdist_egg' in sys.argv and 'build' not in sys.argv:
         sys.argv[:_index] + ['build', 'bdist_egg'] + sys.argv[_index + 1:]
     )
 
+# 'test doesn't always call build for some reason
+if 'test' in sys.argv and 'build' not in sys.argv:
+    _index = sys.argv.index('test')
+    sys.argv[:] = (
+        sys.argv[:_index] + ['build', 'test'] + sys.argv[_index + 1:]
+    )
+
 setup(
     name='librabbitmq',
     version=version,