Py3k improvements

celery/tests/functional/case.py

@@ -5,7 +5,7 @@ import signal
 import socket
 import sys
 import traceback
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from itertools import count
 

celery/tests/test_app_amqp.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.app.amqp import MSG_OPTIONS, extract_msg_options
 

celery/tests/test_backends/__init__.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery import backends
 from celery.backends.amqp import AMQPBackend

celery/tests/test_backends/disabled_amqp.py

@@ -1,5 +1,5 @@
 import sys
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery import states
 from celery.utils import gen_unique_id

celery/tests/test_backends/test_base.py

@@ -1,6 +1,6 @@
 import sys
 import types
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.serialization import subclass_exception
 from celery.serialization import find_nearest_pickleable_exception as fnpe

celery/tests/test_backends/test_cache.py

@@ -1,6 +1,6 @@
 import sys
 import types
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery import states
 from celery.backends.cache import CacheBackend, DummyClient

celery/tests/test_backends/test_database.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from datetime import datetime
 

celery/tests/test_backends/test_redis.py

@@ -1,6 +1,6 @@
 import sys
 import socket
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from nose import SkipTest
 

celery/tests/test_backends/test_tyrant.py

@@ -1,6 +1,6 @@
 import sys
 import socket
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from nose import SkipTest
 

celery/tests/test_beat.py

@@ -1,5 +1,5 @@
 import logging
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from datetime import datetime, timedelta
 

celery/tests/test_bin/test_base.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.bin.base import Command
 

celery/tests/test_bin/test_celerybeat.py

@@ -1,6 +1,6 @@
 import logging
 import sys
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery import beat
 from celery import platforms

celery/tests/test_bin/test_celeryd.py

@@ -1,7 +1,8 @@
 import logging
 import os
 import sys
-import unittest2 as unittest
+from celery.tests.utils import unittest
+from celery.tests.utils import StringIO
 
 from multiprocessing import get_logger, current_process
 from StringIO import StringIO

celery/tests/test_buckets.py

@@ -2,7 +2,7 @@ from __future__ import generators
 
 import sys
 import time
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from itertools import chain, izip
 

celery/tests/test_celery.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 import celery
 

celery/tests/test_concurrency_processes.py

@@ -1,5 +1,5 @@
 import sys
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from itertools import cycle
 

celery/tests/test_datastructures.py

@@ -1,5 +1,5 @@
 import sys
-import unittest2 as unittest
+from celery.tests.utils import unittest
 from Queue import Queue
 
 from celery.datastructures import PositionQueue, ExceptionInfo, LocalCache

celery/tests/test_events.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery import events
 

celery/tests/test_events_state.py

@@ -1,5 +1,5 @@
 from time import time
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from itertools import count
 

celery/tests/test_loaders.py

@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery import task
 from celery import loaders

celery/tests/test_log.py

@@ -2,9 +2,9 @@ from __future__ import generators
 
 import sys
 import logging
-import unittest2 as unittest
+from celery.tests.utils import unittest
 from tempfile import mktemp
-from StringIO import StringIO
+from celery.tests.utils import StringIO
 
 try:
     from contextlib import contextmanager

celery/tests/test_pickle.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.serialization import pickle
 

celery/tests/test_pool.py

@@ -2,7 +2,7 @@ import sys
 import time
 import logging
 import itertools
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.concurrency.processes import TaskPool
 from celery.datastructures import ExceptionInfo

celery/tests/test_registry.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery import registry
 from celery.task import Task, PeriodicTask

celery/tests/test_result.py

@@ -1,6 +1,6 @@
 from __future__ import generators
 
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery import states
 from celery.app import app_or_default

celery/tests/test_routes.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery import routes
 from celery.app import app_or_default

celery/tests/test_serialization.py

@@ -1,5 +1,5 @@
 import sys
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.tests.utils import execute_context, mask_modules
 

celery/tests/test_states.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.states import state
 from celery import states

celery/tests/test_task.py

@@ -1,5 +1,5 @@
-import unittest2 as unittest
-from StringIO import StringIO
+from celery.tests.utils import unittest
+from celery.tests.utils import StringIO
 from datetime import datetime, timedelta
 
 from pyparsing import ParseException

celery/tests/test_task_abortable.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.contrib.abortable import AbortableTask, AbortableAsyncResult
 

celery/tests/test_task_builtins.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.task.builtins import ExecuteRemoteTask
 from celery.task.builtins import PingTask, DeleteExpiredTaskMetaTask

celery/tests/test_task_control.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from kombu.pidbox import Mailbox
 

celery/tests/test_task_http.py

@@ -2,13 +2,13 @@
 from __future__ import generators
 
 import logging
-import unittest2 as unittest
+from celery.tests.utils import unittest
 from urllib import addinfourl
 try:
     from contextlib import contextmanager
 except ImportError:
     from celery.tests.utils import fallback_contextmanager as contextmanager
-from StringIO import StringIO
+from celery.tests.utils import StringIO
 
 from anyjson import serialize
 

celery/tests/test_task_sets.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 import simplejson
 

celery/tests/test_timer2.py

@@ -1,5 +1,5 @@
 import time
-import unittest2 as unittest
+from celery.tests.utils import unittest
 import celery.utils.timer2 as timer2
 
 from celery.tests.utils import skip_if_quick

celery/tests/test_utils.py

@@ -1,5 +1,5 @@
 import pickle
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery import utils
 from celery.utils import promise, mpromise, maybe_promise

celery/tests/test_utils_info.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery import Celery
 from celery.app import app_or_default

celery/tests/test_worker.py

@@ -1,5 +1,5 @@
 import socket
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from datetime import datetime, timedelta
 from Queue import Empty

celery/tests/test_worker_control.py

@@ -1,5 +1,5 @@
 import socket
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from datetime import datetime, timedelta
 

celery/tests/test_worker_controllers.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from Queue import Queue
 

celery/tests/test_worker_heartbeat.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.worker.heartbeat import Heart
 

celery/tests/test_worker_job.py

@@ -2,9 +2,8 @@
 import logging
 import simplejson
 import sys
-import unittest2 as unittest
-
-from StringIO import StringIO
+from celery.tests.utils import unittest
+from celery.tests.utils import StringIO
 
 from kombu.transport.base import Message
 

celery/tests/test_worker_revoke.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.worker import state
 

celery/tests/test_worker_state.py

@@ -1,4 +1,4 @@
-import unittest2 as unittest
+from celery.tests.utils import unittest
 
 from celery.datastructures import LimitedSet
 from celery.worker import state

celery/tests/utils.py

@@ -1,9 +1,21 @@
 from __future__ import generators
 
+try:
+    import unittest
+    unittest.skip
+except AttributeError:
+    import unittest2 as unittest
+
 import os
 import sys
-import __builtin__
-from StringIO import StringIO
+try:
+    import __builtin__ as builtins
+except ImportError:    # py3k
+    import builtins
+try:
+    from StringIO import StringIO
+except ImportError:
+    from io import StringIO
 
 from nose import SkipTest
 
@@ -203,7 +215,7 @@ def mask_modules(*modnames):
 
     """
 
-    realimport = __builtin__.__import__
+    realimport = builtins.__import__
 
     def myimp(name, *args, **kwargs):
         if name in modnames:
@@ -211,9 +223,9 @@ def mask_modules(*modnames):
         else:
             return realimport(name, *args, **kwargs)
 
-    __builtin__.__import__ = myimp
+    builtins.__import__ = myimp
     yield True
-    __builtin__.__import__ = realimport
+    builtins.__import__ = realimport
 
 
 @contextmanager

setup.py

@@ -37,7 +37,7 @@ def with_dist_not_in_path(fun):
             dist_module = sys.modules.pop("celery", None)
             try:
                 import celery as existing_module
-            except ImportError, exc:
+            except ImportError:
                 pass
             else:
                 kwargs["celery"] = existing_module