Fixed a bunch of Python 2.3 issues. Two tests still fail, but this fixes the bulk of things.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6183 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
fa5e935af0
commit
ea3e89cb1d
|
@ -9,6 +9,11 @@ from django.utils.encoding import smart_unicode
|
|||
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):
|
||||
|
|
|
@ -243,7 +243,7 @@ class ClientTest(TestCase):
|
|||
|
||||
# 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/')
|
||||
|
|
|
@ -252,7 +252,7 @@ class LoginTests(TestCase):
|
|||
# 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/")
|
||||
|
|
|
@ -4,6 +4,13 @@ import os, sys, traceback
|
|||
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'
|
||||
|
|
Loading…
Reference in New Issue