Changeset 6183

Timestamp:

09/14/07 04:55:17 (10 months ago)

Author:

mtredinnick

Message:

Fixed a bunch of Python 2.3 issues. Two tests still fail, but this fixes the bulk of things.

Files:

• django/trunk/django/contrib/localflavor/br/forms.py (modified) (1 diff)
• django/trunk/tests/modeltests/test_client/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/test_client_regress/models.py (modified) (1 diff)
• django/trunk/tests/runtests.py (modified) (1 diff)

django/trunk/django/contrib/localflavor/br/forms.py

@@ -9 +9 @@
-from django.utils.translation import ugettext as _
-import re
+
+try:
+    set
+except NameError:
+    from sets import Set as set     # For Python 2.3
-
-phone_digits_re = re.compile(r'^(\d{2})[-\.]?(\d{4})[-\.]?(\d{4})$')

django/trunk/tests/modeltests/test_client/models.py

@@ -244 +244 @@
-        # Log in
-        login = self.client.login(username='testclient', password='password')
-assertTrue
+failUnless
-
-        # Request a page that requires a login

django/trunk/tests/regressiontests/test_client_regress/models.py

@@ -253 +253 @@
-        c = Client()
-        login = c.login(username='testclient', password='password')
-assertTrue
+failUnless
-
-        # Get a redirection page with the second client.

django/trunk/tests/runtests.py

@@ -5 +5 @@
-
-import django.contrib as contrib
+
+try:
+    set
+except NameError:
+    from sets import Set as set     # For Python 2.3
+
+
-CONTRIB_DIR_NAME = 'django.contrib'
-MODEL_TESTS_DIR_NAME = 'modeltests'