Ticket #15828: unittest-django-vs-unittest-0.5.1.diff

__init__.py

@@ -26 +26 @@
 SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 """
 
-import sys
-
-# Django hackery to load the appropriate version of unittest
-
-try:
-    # check the system path first
-    from unittest2 import *
-except ImportError:
-    if sys.version_info >= (2,7):
-        # unittest2 features are native in Python 2.7
-        from unittest import *
-    else:
-        # otherwise use our bundled version
         __all__ = ['TestResult', 'TestCase', 'TestSuite',
                    'TextTestRunner', 'TestLoader', 'FunctionTestCase', 'main',
                    'defaultTestLoader', 'SkipTest', 'skip', 'skipIf', 'skipUnless',
@@ -50 +37 @@
         __all__.extend(['getTestCaseNames', 'makeSuite', 'findTestCases'])
 
 
-        from django.utils.unittest.collector import collector
-        from django.utils.unittest.result import TestResult
-        from django.utils.unittest.case import \
-            TestCase, FunctionTestCase, SkipTest, skip, skipIf,\
+from unittest2.collector import collector
+from unittest2.result import TestResult
+from unittest2.case import (
+    TestCase, FunctionTestCase, SkipTest, skip, skipIf,
             skipUnless, expectedFailure
-
-        from django.utils.unittest.suite import BaseTestSuite, TestSuite
-        from django.utils.unittest.loader import \
-            TestLoader, defaultTestLoader, makeSuite, getTestCaseNames,\
+)
+from unittest2.suite import BaseTestSuite, TestSuite
+from unittest2.loader import (
+    TestLoader, defaultTestLoader, makeSuite, getTestCaseNames,
             findTestCases
-
-        from django.utils.unittest.main import TestProgram, main, main_
-        from django.utils.unittest.runner import TextTestRunner, TextTestResult
+)
+from unittest2.main import TestProgram, main, main_
+from unittest2.runner import TextTestRunner, TextTestResult
 
         try:
-            from django.utils.unittest.signals import\
+    from unittest2.signals import (
                 installHandler, registerResult, removeResult, removeHandler
+    )
         except ImportError:
             # Compatibility with platforms that don't have the signal module
             pass

__main__.py

@@ -6 +6 @@
 
 __unittest = True
 
-from django.utils.unittest.main import main_
+from unittest2.main import main_
 main_()

case.py

@@ -7 +7 @@
 import unittest
 import warnings
 
-from django.utils.unittest import result
-from django.utils.unittest.util import\
-    safe_repr, safe_str, strclass,\
+from unittest2 import result
+from unittest2.util import (
+    safe_repr, safe_str, strclass,
     unorderable_list_difference
+)
 
-from django.utils.unittest.compatibility import wraps
+from unittest2.compatibility import wraps
 
 __unittest = True
 
@@ -479 +480 @@
             excName = excClass.__name__
         else:
             excName = str(excClass)
-        raise self.failureException("%s not raised" % excName)
+        raise self.failureException, "%s not raised" % excName
 
     def _getAssertEqualityFunc(self, first, second):
         """Get a detailed comparison function for the types of the two args.
@@ -831 +832 @@
             self.fail(self._formatMessage(msg, standardMsg))
 
     def assertDictEqual(self, d1, d2, msg=None):
-        self.assertTrue(isinstance(d1, dict), 'First argument is not a dictionary')
-        self.assertTrue(isinstance(d2, dict), 'Second argument is not a dictionary')
+        self.assert_(isinstance(d1, dict), 'First argument is not a dictionary')
+        self.assert_(isinstance(d2, dict), 'Second argument is not a dictionary')
 
         if d1 != d2:
             standardMsg = '%s != %s' % (safe_repr(d1, True), safe_repr(d2, True))
@@ -909 +910 @@
 
     def assertMultiLineEqual(self, first, second, msg=None):
         """Assert that two multi-line strings are equal."""
-        self.assertTrue(isinstance(first, basestring), (
+        self.assert_(isinstance(first, basestring), (
                 'First argument is not a string'))
-        self.assertTrue(isinstance(second, basestring), (
+        self.assert_(isinstance(second, basestring), (
                 'Second argument is not a string'))
 
         if first != second:
@@ -997 +998 @@
                 excName = expected_exception.__name__
             else:
                 excName = str(expected_exception)
-            raise self.failureException("%s not raised" % excName)
+            raise self.failureException, "%s not raised" % excName
+
 
     def assertRegexpMatches(self, text, expected_regexp, msg=None):
         """Fail the test unless the text matches the regular expression."""

collector.py

@@ -1 +1 @@
 import os
 import sys
-from django.utils.unittest.loader import defaultTestLoader
+from unittest2.loader import defaultTestLoader
 
 def collector():
     # import __main__ triggers code re-execution

loader.py

@@ -9 +9 @@
 
 from fnmatch import fnmatch
 
-from django.utils.unittest import case, suite
+from unittest2 import case, suite
 
 try:
     from os.path import relpath
 except ImportError:
-    from django.utils.unittest.compatibility import relpath
+    from unittest2.compatibility import relpath
 
 __unittest = True
 

main.py

@@ -4 +4 @@
 import os
 import types
 
-from django.utils.unittest import loader, runner
+from unittest2 import loader, runner
 try:
-    from django.utils.unittest.signals import installHandler
+    from unittest2.signals import installHandler
 except ImportError:
     installHandler = None
 

result.py

@@ -6 +6 @@
 
 from StringIO import StringIO
 
-from django.utils.unittest import util
-from django.utils.unittest.compatibility import wraps
+from unittest2 import util
+from unittest2.compatibility import wraps
 
 __unittest = True
 

runner.py

@@ -4 +4 @@
 import time
 import unittest
 
-from django.utils.unittest import result
+from unittest2 import result
 
 try:
-    from django.utils.unittest.signals import registerResult
+    from unittest2.signals import registerResult
 except ImportError:
     def registerResult(_):
         pass

signals.py

@@ -1 +1 @@
 import signal
 import weakref
 
-from django.utils.unittest.compatibility import wraps
+from unittest2.compatibility import wraps
 
 __unittest = True
 

suite.py

@@ -2 +2 @@
 
 import sys
 import unittest
-from django.utils.unittest import case, util
+from unittest2 import case, util
 
 __unittest = True