Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed a bunch of Python 2.3 issues. Two tests still fail, but this fi…

…xes the bulk of things.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit ea3e89cb1d32f1fc6cafa656a4d6d9863f2fefc5 1 parent fa5e935
@malcolmt malcolmt authored
View
5 django/contrib/localflavor/br/forms.py
@@ -9,6 +9,11 @@
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})$')
class BRZipCodeField(RegexField):
View
2  tests/modeltests/test_client/models.py
@@ -243,7 +243,7 @@ def test_view_with_login(self):
# Log in
login = self.client.login(username='testclient', password='password')
- self.assertTrue(login, 'Could not log in')
+ self.failUnless(login, 'Could not log in')
# Request a page that requires a login
response = self.client.get('/test_client/login_protected_view/')
View
2  tests/regressiontests/test_client_regress/models.py
@@ -252,7 +252,7 @@ def test_login_different_client(self):
# Create a second client, and log in.
c = Client()
login = c.login(username='testclient', password='password')
- self.assertTrue(login, 'Could not log in')
+ self.failUnless(login, 'Could not log in')
# Get a redirection page with the second client.
response = c.get("/test_client_regress/login_protected_redirect_view/")
View
7 tests/runtests.py
@@ -4,6 +4,13 @@
import unittest
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'
REGRESSION_TESTS_DIR_NAME = 'regressiontests'
Please sign in to comment.
Something went wrong with that request. Please try again.