From e28c0edbeeef3401b1afc2166d68ba0327903ad3 Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Tue, 4 May 2010 13:31:25 +0000 Subject: [PATCH] [1.1.X] Fixed some Python 2.3 incompatibilities in new tests. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13093 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/utils/module_loading.py | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/regressiontests/utils/module_loading.py b/tests/regressiontests/utils/module_loading.py index 7b233f8e14..c65c23bb14 100644 --- a/tests/regressiontests/utils/module_loading.py +++ b/tests/regressiontests/utils/module_loading.py @@ -12,16 +12,16 @@ class DefaultLoader(TestCase): test_module = import_module('regressiontests.utils.test_module') # An importable child - self.assertTrue(module_has_submodule(test_module, 'good_module')) + self.failUnless(module_has_submodule(test_module, 'good_module')) mod = import_module('regressiontests.utils.test_module.good_module') self.assertEqual(mod.content, 'Good Module') # A child that exists, but will generate an import error if loaded - self.assertTrue(module_has_submodule(test_module, 'bad_module')) + self.failUnless(module_has_submodule(test_module, 'bad_module')) self.assertRaises(ImportError, import_module, 'regressiontests.utils.test_module.bad_module') # A child that doesn't exist - self.assertFalse(module_has_submodule(test_module, 'no_such_module')) + self.failIf(module_has_submodule(test_module, 'no_such_module')) self.assertRaises(ImportError, import_module, 'regressiontests.utils.test_module.no_such_module') class EggLoader(TestCase): @@ -39,16 +39,16 @@ class EggLoader(TestCase): egg_module = import_module('egg_module') # An importable child - self.assertTrue(module_has_submodule(egg_module, 'good_module')) + self.failUnless(module_has_submodule(egg_module, 'good_module')) mod = import_module('egg_module.good_module') self.assertEqual(mod.content, 'Good Module') # A child that exists, but will generate an import error if loaded - self.assertTrue(module_has_submodule(egg_module, 'bad_module')) + self.failUnless(module_has_submodule(egg_module, 'bad_module')) self.assertRaises(ImportError, import_module, 'egg_module.bad_module') # A child that doesn't exist - self.assertFalse(module_has_submodule(egg_module, 'no_such_module')) + self.failIf(module_has_submodule(egg_module, 'no_such_module')) self.assertRaises(ImportError, import_module, 'egg_module.no_such_module') def test_deep_loader(self): @@ -58,16 +58,16 @@ class EggLoader(TestCase): egg_module = import_module('egg_module.sub1.sub2') # An importable child - self.assertTrue(module_has_submodule(egg_module, 'good_module')) + self.failUnless(module_has_submodule(egg_module, 'good_module')) mod = import_module('egg_module.sub1.sub2.good_module') self.assertEqual(mod.content, 'Deep Good Module') # A child that exists, but will generate an import error if loaded - self.assertTrue(module_has_submodule(egg_module, 'bad_module')) + self.failUnless(module_has_submodule(egg_module, 'bad_module')) self.assertRaises(ImportError, import_module, 'egg_module.sub1.sub2.bad_module') # A child that doesn't exist - self.assertFalse(module_has_submodule(egg_module, 'no_such_module')) + self.failIf(module_has_submodule(egg_module, 'no_such_module')) self.assertRaises(ImportError, import_module, 'egg_module.sub1.sub2.no_such_module') class TestFinder(object): @@ -107,16 +107,16 @@ class CustomLoader(TestCase): egg_module = import_module('egg_module') # An importable child - self.assertTrue(module_has_submodule(egg_module, 'good_module')) + self.failUnless(module_has_submodule(egg_module, 'good_module')) mod = import_module('egg_module.good_module') self.assertEqual(mod.content, 'Good Module') # A child that exists, but will generate an import error if loaded - self.assertTrue(module_has_submodule(egg_module, 'bad_module')) + self.failUnless(module_has_submodule(egg_module, 'bad_module')) self.assertRaises(ImportError, import_module, 'egg_module.bad_module') # A child that doesn't exist - self.assertFalse(module_has_submodule(egg_module, 'no_such_module')) + self.failIf(module_has_submodule(egg_module, 'no_such_module')) self.assertRaises(ImportError, import_module, 'egg_module.no_such_module') def test_deep_loader(self): @@ -126,14 +126,14 @@ class CustomLoader(TestCase): egg_module = import_module('egg_module.sub1.sub2') # An importable child - self.assertTrue(module_has_submodule(egg_module, 'good_module')) + self.failUnless(module_has_submodule(egg_module, 'good_module')) mod = import_module('egg_module.sub1.sub2.good_module') self.assertEqual(mod.content, 'Deep Good Module') # A child that exists, but will generate an import error if loaded - self.assertTrue(module_has_submodule(egg_module, 'bad_module')) + self.failUnless(module_has_submodule(egg_module, 'bad_module')) self.assertRaises(ImportError, import_module, 'egg_module.sub1.sub2.bad_module') # A child that doesn't exist - self.assertFalse(module_has_submodule(egg_module, 'no_such_module')) + self.failIf(module_has_submodule(egg_module, 'no_such_module')) self.assertRaises(ImportError, import_module, 'egg_module.sub1.sub2.no_such_module')