Permalink
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...
malcolmt committed Sep 14, 2007
1 parent fa5e935 commit ea3e89cb1d32f1fc6cafa656a4d6d9863f2fefc5
@@ -9,6 +9,11 @@
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
import re 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})$') phone_digits_re = re.compile(r'^(\d{2})[-\.]?(\d{4})[-\.]?(\d{4})$')
class BRZipCodeField(RegexField): class BRZipCodeField(RegexField):
@@ -243,7 +243,7 @@ def test_view_with_login(self):
# Log in # Log in
login = self.client.login(username='testclient', password='password') 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 # Request a page that requires a login
response = self.client.get('/test_client/login_protected_view/') response = self.client.get('/test_client/login_protected_view/')
@@ -252,7 +252,7 @@ def test_login_different_client(self):
# Create a second client, and log in. # Create a second client, and log in.
c = Client() c = Client()
login = c.login(username='testclient', password='password') 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. # Get a redirection page with the second client.
response = c.get("/test_client_regress/login_protected_redirect_view/") response = c.get("/test_client_regress/login_protected_redirect_view/")
View
@@ -4,6 +4,13 @@
import unittest import unittest
import django.contrib as contrib import django.contrib as contrib
try:
set
except NameError:
from sets import Set as set # For Python 2.3
CONTRIB_DIR_NAME = 'django.contrib' CONTRIB_DIR_NAME = 'django.contrib'
MODEL_TESTS_DIR_NAME = 'modeltests' MODEL_TESTS_DIR_NAME = 'modeltests'
REGRESSION_TESTS_DIR_NAME = 'regressiontests' REGRESSION_TESTS_DIR_NAME = 'regressiontests'

0 comments on commit ea3e89c

Please sign in to comment.