Commit f657079c authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #14486 -- Modified the import order for the bundled unittest so that a... 

Fixed #14486 -- Modified the import order for the bundled unittest so that a locally installed unittest2 (which will have more features) will supersede the Python 2.7 native version. Thanks to Michael Foord for the suggestion.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14259 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 8cb4bf5e

django/utils/unittest/__init__.py

+8 −8
Original line number Diff line number Diff line
@@ -30,14 +30,14 @@ import sys 


# Django hackery to load the appropriate version of unittest



if sys.version_info >= (2,7):

    # unittest2 features are native in Python 2.7

    from unittest import *

else:

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',