Commit ffa8a9ab authored by Florian Apolloner's avatar Florian Apolloner
Browse files

Fixed python 3.2 compat.

parent 89bf7a45

django/core/compat_checks/base.py

+3 −3
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ def check_compatibility(): 
    messages = []



    for check_module in COMPAT_CHECKS:

        check = getattr(check_module, u'run_checks', None)

        check = getattr(check_module, 'run_checks', None)



        if check is None:

            warnings.warn(

                u"The '%s' module lacks a " % check_module.__name__ +

                u"'run_checks' method, which is needed to verify compatibility."

                "The '%s' module lacks a " % check_module.__name__ +

                "'run_checks' method, which is needed to verify compatibility."

            )

            continue

django/core/compat_checks/django_1_6_0.py

+9 −9
Original line number Diff line number Diff line
@@ -10,19 +10,19 @@ def check_test_runner(): 
    doing & avoid generating a message.

    """

    from django.conf import settings

    new_default = u'django.test.runner.DiscoverRunner'

    test_runner_setting = getattr(settings, u'TEST_RUNNER', new_default)

    new_default = 'django.test.runner.DiscoverRunner'

    test_runner_setting = getattr(settings, 'TEST_RUNNER', new_default)



    if test_runner_setting == new_default:

        message = [

            u"You have not explicitly set 'TEST_RUNNER'. In Django 1.6,",

            u"there is a new test runner ('%s')" % new_default,

            u"by default. You should ensure your tests are still all",

            u"running & behaving as expected. See",

            u"https://docs.djangoproject.com/en/dev/releases/1.6/#discovery-of-tests-in-any-test-module",

            u"for more information.",

            "You have not explicitly set 'TEST_RUNNER'. In Django 1.6,",

            "there is a new test runner ('%s')" % new_default,

            "by default. You should ensure your tests are still all",

            "running & behaving as expected. See",

            "https://docs.djangoproject.com/en/dev/releases/1.6/#discovery-of-tests-in-any-test-module",

            "for more information.",

        ]

        return u' '.join(message)

        return ' '.join(message)





def run_checks():

django/core/management/commands/checksetup.py

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ from django.core.management.base import NoArgsCommand 




class Command(NoArgsCommand):

    help = u"Checks your configuration's compatibility with this version " + \

           u"of Django."

    help = "Checks your configuration's compatibility with this version " + \

           "of Django."



    def handle_noargs(self, **options):

        for message in check_compatibility():