Commit 419747d1 authored by Gary Wilson Jr's avatar Gary Wilson Jr
Browse files

Fixed a few Python 2.3 incompatibilities that were causing test failures. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@10863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent bd58a397

django/forms/models.py

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ class BaseModelFormSet(BaseFormSet): 
        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):

tests/regressiontests/admin_scripts/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ class DjangoAdminSettingsDirectory(AdminScriptTestCase): 
        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):

tests/regressiontests/file_storage/tests.py

+6 −6
Original line number Diff line number Diff line
@@ -161,9 +161,9 @@ class FileStoragePathParsing(TestCase): 
        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 @@ class FileStoragePathParsing(TestCase): 
        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):