Blob Blame History Raw
From 2cacf170d2b023138054c4fe4a7700e980c598c2 Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 12 Jun 2014 09:14:07 -0400
Subject: [PATCH] Just use unittest1.

---
 anykeystore/tests/integration/tests.py            | 2 +-
 anykeystore/tests/test_backends/test_memcached.py | 2 +-
 anykeystore/tests/test_backends/test_memory.py    | 2 +-
 anykeystore/tests/test_backends/test_mongodb.py   | 2 +-
 anykeystore/tests/test_backends/test_redis.py     | 2 +-
 anykeystore/tests/test_backends/test_sqla.py      | 2 +-
 setup.py                                          | 7 +------
 7 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/anykeystore/tests/integration/tests.py b/anykeystore/tests/integration/tests.py
index b2a8412..655ebe2 100644
--- a/anykeystore/tests/integration/tests.py
+++ b/anykeystore/tests/integration/tests.py
@@ -1,6 +1,6 @@
 import os
 import time
-import unittest2 as unittest
+import unittest
 from ConfigParser import ConfigParser
 
 
diff --git a/anykeystore/tests/test_backends/test_memcached.py b/anykeystore/tests/test_backends/test_memcached.py
index 5243dba..09db7f4 100644
--- a/anykeystore/tests/test_backends/test_memcached.py
+++ b/anykeystore/tests/test_backends/test_memcached.py
@@ -1,4 +1,4 @@
-import unittest2 as unittest
+import unittest
 from mock import MagicMock
 
 class TestMemcachedStore(unittest.TestCase):
diff --git a/anykeystore/tests/test_backends/test_memory.py b/anykeystore/tests/test_backends/test_memory.py
index 6cc8709..863fb07 100644
--- a/anykeystore/tests/test_backends/test_memory.py
+++ b/anykeystore/tests/test_backends/test_memory.py
@@ -1,4 +1,4 @@
-import unittest2 as unittest
+import unittest
 
 class TestMemoryStore(unittest.TestCase):
 
diff --git a/anykeystore/tests/test_backends/test_mongodb.py b/anykeystore/tests/test_backends/test_mongodb.py
index e7d91dc..a53488d 100644
--- a/anykeystore/tests/test_backends/test_mongodb.py
+++ b/anykeystore/tests/test_backends/test_mongodb.py
@@ -1,6 +1,6 @@
 from datetime import datetime, timedelta
 
-import unittest2 as unittest
+import unittest
 from mock import MagicMock, patch
 
 class TestMongoStore(unittest.TestCase):
diff --git a/anykeystore/tests/test_backends/test_redis.py b/anykeystore/tests/test_backends/test_redis.py
index ae3e470..1b4e519 100644
--- a/anykeystore/tests/test_backends/test_redis.py
+++ b/anykeystore/tests/test_backends/test_redis.py
@@ -1,4 +1,4 @@
-import unittest2 as unittest
+import unittest
 from mock import MagicMock, patch
 
 class TestRedisStore(unittest.TestCase):
diff --git a/anykeystore/tests/test_backends/test_sqla.py b/anykeystore/tests/test_backends/test_sqla.py
index 2184a19..22fa2d0 100644
--- a/anykeystore/tests/test_backends/test_sqla.py
+++ b/anykeystore/tests/test_backends/test_sqla.py
@@ -1,4 +1,4 @@
-import unittest2 as unittest
+import unittest
 from mock import MagicMock, patch
 
 class TestSQLStore(unittest.TestCase):
diff --git a/setup.py b/setup.py
index 759dffe..6eade0f 100644
--- a/setup.py
+++ b/setup.py
@@ -25,11 +25,6 @@ tests_require = requires + [
     'mock',
 ]
 
-if PY3:
-    tests_require.append('unittest2py3k')
-else:
-    tests_require.append('unittest2')
-
 setup(
     name='anykeystore',
     version='0.2',
@@ -56,7 +51,7 @@ setup(
     zip_safe=False,
     install_requires=requires,
     tests_require=tests_require,
-    test_suite='unittest2.collector',
+    test_suite='nose.collector',
     entry_points="""\
     """,
 )
-- 
1.9.3