From dff31de20aac85e4f4834c2466762cbf23fc0a7b Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Thu, 9 Jun 2011 20:01:28 +0000 Subject: Fixed #16155 -- Removed Python 2.4 compatibility constructs from code and mentions from docs. Thanks Aymeric Augustin for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16349 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/admin_scripts/tests.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'tests/regressiontests/admin_scripts') diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index 11bd5c687a..cf0dfc6cc8 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -1126,20 +1126,14 @@ class CommandTypes(AdminScriptTestCase): "--help is handled as a special case" args = ['--help'] out, err = self.run_manage(args) - if sys.version_info < (2, 5): - self.assertOutput(out, "usage: manage.py subcommand [options] [args]") - else: - self.assertOutput(out, "Usage: manage.py subcommand [options] [args]") + self.assertOutput(out, "Usage: manage.py subcommand [options] [args]") self.assertOutput(out, "Type 'manage.py help ' for help on a specific subcommand.") def test_short_help(self): "-h is handled as a short form of --help" args = ['-h'] out, err = self.run_manage(args) - if sys.version_info < (2, 5): - self.assertOutput(out, "usage: manage.py subcommand [options] [args]") - else: - self.assertOutput(out, "Usage: manage.py subcommand [options] [args]") + self.assertOutput(out, "Usage: manage.py subcommand [options] [args]") self.assertOutput(out, "Type 'manage.py help ' for help on a specific subcommand.") def test_specific_help(self): -- cgit v1.3