Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed a few Python 2.3 incompatibilities that were causing test failu…

…res.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 419747d1c8363f06a143429ffe58e67f2f217b5e 1 parent bd58a39
@gdub gdub authored
View
2  django/forms/models.py
@@ -584,7 +584,7 @@ def get_unique_error_message(self, unique_check):
else:
return ugettext("Please correct the duplicate data for %(field)s, "
"which must be unique.") % {
- "field": get_text_list(unique_check, _("and")),
+ "field": get_text_list(unique_check, unicode(_("and"))),
}
def get_date_error_message(self, date_check):
View
2  tests/regressiontests/admin_scripts/tests.py
@@ -536,7 +536,7 @@ def test_setup_environ(self):
args = ['startapp','settings_test']
out, err = self.run_django_admin(args,'settings')
self.assertNoOutput(err)
- self.assertTrue(os.path.exists(os.path.join(test_dir, 'settings_test')))
+ self.assert_(os.path.exists(os.path.join(test_dir, 'settings_test')))
shutil.rmtree(os.path.join(test_dir, 'settings_test'))
def test_builtin_command(self):
View
12 tests/regressiontests/file_storage/tests.py
@@ -161,9 +161,9 @@ def test_directory_with_dot(self):
self.storage.save('dotted.path/test', ContentFile("1"))
self.storage.save('dotted.path/test', ContentFile("2"))
- self.assertFalse(os.path.exists(os.path.join(self.storage_dir, 'dotted_.path')))
- self.assertTrue(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/test')))
- self.assertTrue(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/test_')))
+ self.failIf(os.path.exists(os.path.join(self.storage_dir, 'dotted_.path')))
+ self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/test')))
+ self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/test_')))
def test_first_character_dot(self):
"""
@@ -173,13 +173,13 @@ def test_first_character_dot(self):
self.storage.save('dotted.path/.test', ContentFile("1"))
self.storage.save('dotted.path/.test', ContentFile("2"))
- self.assertTrue(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/.test')))
+ self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/.test')))
# Before 2.6, a leading dot was treated as an extension, and so
# underscore gets added to beginning instead of end.
if sys.version_info < (2, 6):
- self.assertTrue(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/_.test')))
+ self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/_.test')))
else:
- self.assertTrue(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/.test_')))
+ self.assert_(os.path.exists(os.path.join(self.storage_dir, 'dotted.path/.test_')))
if Image is not None:
class DimensionClosingBug(TestCase):
Please sign in to comment.
Something went wrong with that request. Please try again.