diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index 442f3577827..b048048d69f 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -6,6 +6,7 @@ and default settings.py files. import os import unittest import shutil +import sys from django import conf, bin, get_version from django.conf import settings @@ -737,7 +738,10 @@ class CommandTypes(AdminScriptTestCase): "--help is handled as a special case" args = ['--help'] out, err = self.run_manage(args) - self.assertOutput(out, "Usage: manage.py [options]") + if sys.version_info < (2, 4): + self.assertOutput(out, "usage: manage.py [options]") + else: + self.assertOutput(out, "Usage: manage.py [options]") self.assertOutput(err, "Type 'manage.py help ' for help on a specific subcommand.") def test_specific_help(self): diff --git a/tests/regressiontests/admin_views/tests.py b/tests/regressiontests/admin_views/tests.py index ad50928aa96..acdf9f57426 100644 --- a/tests/regressiontests/admin_views/tests.py +++ b/tests/regressiontests/admin_views/tests.py @@ -102,7 +102,7 @@ class AdminViewPermissionsTest(TestCase): self.failUnlessEqual(request.status_code, 200) login = self.client.post('/test_admin/admin/', self.super_login) self.assertRedirects(login, '/test_admin/admin/') - self.assertFalse(login.context) + self.failIf(login.context) self.client.get('/test_admin/admin/logout/') # Test if user enters e-mail address @@ -124,7 +124,7 @@ class AdminViewPermissionsTest(TestCase): self.failUnlessEqual(request.status_code, 200) login = self.client.post('/test_admin/admin/', self.adduser_login) self.assertRedirects(login, '/test_admin/admin/') - self.assertFalse(login.context) + self.failIf(login.context) self.client.get('/test_admin/admin/logout/') # Change User @@ -132,7 +132,7 @@ class AdminViewPermissionsTest(TestCase): self.failUnlessEqual(request.status_code, 200) login = self.client.post('/test_admin/admin/', self.changeuser_login) self.assertRedirects(login, '/test_admin/admin/') - self.assertFalse(login.context) + self.failIf(login.context) self.client.get('/test_admin/admin/logout/') # Delete User @@ -140,7 +140,7 @@ class AdminViewPermissionsTest(TestCase): self.failUnlessEqual(request.status_code, 200) login = self.client.post('/test_admin/admin/', self.deleteuser_login) self.assertRedirects(login, '/test_admin/admin/') - self.assertFalse(login.context) + self.failIf(login.context) self.client.get('/test_admin/admin/logout/') # Regular User should not be able to login. diff --git a/tests/regressiontests/utils/tests.py b/tests/regressiontests/utils/tests.py index cd4762e02f5..485c5faa75b 100644 --- a/tests/regressiontests/utils/tests.py +++ b/tests/regressiontests/utils/tests.py @@ -11,6 +11,13 @@ import datastructures import itercompat from decorators import DecoratorFromMiddlewareTests +# We need this because "datastructures" uses sorted() and the tests are run in +# the scope of this module. +try: + sorted +except NameError: + from django.utils.itercompat import sorted # For Python 2.3 + # Extra tests __test__ = { 'timesince': timesince,