From ffa8a9ab24c8db6ed3ddc6ca09e8e852c651244b Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Fri, 14 Jun 2013 15:44:45 +0200 Subject: [PATCH] Fixed python 3.2 compat. --- django/core/compat_checks/base.py | 6 +++--- django/core/compat_checks/django_1_6_0.py | 18 +++++++++--------- django/core/management/commands/checksetup.py | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/django/core/compat_checks/base.py b/django/core/compat_checks/base.py index b3d47a617c..e54b50f287 100644 --- a/django/core/compat_checks/base.py +++ b/django/core/compat_checks/base.py @@ -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 diff --git a/django/core/compat_checks/django_1_6_0.py b/django/core/compat_checks/django_1_6_0.py index 53fe150cab..bb0dabedac 100644 --- a/django/core/compat_checks/django_1_6_0.py +++ b/django/core/compat_checks/django_1_6_0.py @@ -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(): diff --git a/django/core/management/commands/checksetup.py b/django/core/management/commands/checksetup.py index 35082b6093..d37e826757 100644 --- a/django/core/management/commands/checksetup.py +++ b/django/core/management/commands/checksetup.py @@ -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():