diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-07-22 19:48:36 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-07-22 19:48:36 +0000 |
| commit | c5a76a366970dc1305bb638ed6bd070d0a86376c (patch) | |
| tree | 7e8d9ff2c54bacf8c75044d44d92677be6e2b092 /tests/regressiontests/admin_scripts | |
| parent | d1ea8b2842a9d1fd54c799e9f374d6b53931942e (diff) | |
Fixed a bunch of Python 2.3 test failures.
All remaining buildbot failures on 2.3 are not due to the test suite, as far as
I can work out.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests/regressiontests/admin_scripts')
| -rw-r--r-- | tests/regressiontests/admin_scripts/tests.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index 442f357782..b048048d69 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 <subcommand>' for help on a specific subcommand.") def test_specific_help(self): |