Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.1.X] Made a few Python 2.3 compatibility test fixes.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey 2010-03-08 04:37:45 +00:00
parent 1adc88f4b4
commit 9b2ac2ad2d
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/modeltests/field_subclassing/tests.py
View File

@ -7,15 +7,15 @@ class CustomField(TestCase):
def test_defer(self): def test_defer(self):
d = DataModel.objects.create(data=[1, 2, 3]) d = DataModel.objects.create(data=[1, 2, 3])
self.assertTrue(isinstance(d.data, list)) self.failUnless(isinstance(d.data, list))
d = DataModel.objects.get(pk=d.pk) d = DataModel.objects.get(pk=d.pk)
self.assertTrue(isinstance(d.data, list)) self.failUnless(isinstance(d.data, list))
self.assertEqual(d.data, [1, 2, 3]) self.assertEqual(d.data, [1, 2, 3])
d = DataModel.objects.defer("data").get(pk=d.pk) d = DataModel.objects.defer("data").get(pk=d.pk)
d.save() d.save()
d = DataModel.objects.get(pk=d.pk) d = DataModel.objects.get(pk=d.pk)
self.assertTrue(isinstance(d.data, list)) self.failUnless(isinstance(d.data, list))
self.assertEqual(d.data, [1, 2, 3]) self.assertEqual(d.data, [1, 2, 3])

8
tests/regressiontests/mail/tests.py
View File

@ -112,8 +112,8 @@ BadHeaderError: Header values can't contain newlines (got u'Subject\nInjection T
>>> email.encoding = 'iso-8859-1' >>> email.encoding = 'iso-8859-1'
>>> email.message()['To'] >>> email.message()['To']
'=?iso-8859-1?q?S=FCrname=2C_Firstname?= <to@example.com>, other@example.com' '=?iso-8859-1?q?S=FCrname=2C_Firstname?= <to@example.com>, other@example.com'
>>> email.message()['Subject'].encode() >>> email.message()['Subject'].encode() == u'=?iso-8859-1?q?Message_from_Firstname_S=FCrname?='
u'=?iso-8859-1?q?Message_from_Firstname_S=FCrname?=' True
# Make sure headers can be set with a different encoding than utf-8 in SafeMIMEMultipart as well # Make sure headers can be set with a different encoding than utf-8 in SafeMIMEMultipart as well
>>> headers = {"Date": "Fri, 09 Nov 2001 01:08:47 -0000", "Message-ID": "foo"} >>> headers = {"Date": "Fri, 09 Nov 2001 01:08:47 -0000", "Message-ID": "foo"}
@ -125,8 +125,8 @@ u'=?iso-8859-1?q?Message_from_Firstname_S=FCrname?='
>>> msg.encoding = 'iso-8859-1' >>> msg.encoding = 'iso-8859-1'
>>> msg.message()['To'] >>> msg.message()['To']
'=?iso-8859-1?q?S=FCrname=2C_Firstname?= <to@example.com>' '=?iso-8859-1?q?S=FCrname=2C_Firstname?= <to@example.com>'
>>> msg.message()['Subject'].encode() >>> msg.message()['Subject'].encode() == u'=?iso-8859-1?q?Message_from_Firstname_S=FCrname?='
u'=?iso-8859-1?q?Message_from_Firstname_S=FCrname?=' True
# Regression for #12791 - Encode body correctly with other encodings than utf-8 # Regression for #12791 - Encode body correctly with other encodings than utf-8
>>> email = EmailMessage('Subject', 'Firstname Sürname is a great guy.', 'from@example.com', ['other@example.com']) >>> email = EmailMessage('Subject', 'Firstname Sürname is a great guy.', 'from@example.com', ['other@example.com'])

4
tests/regressiontests/model_fields/tests.py
View File

@ -35,10 +35,10 @@ class BasicFieldTests(django.test.TestCase):
choices = [(0, 0), (1, 1)] choices = [(0, 0), (1, 1)]
model_field = models.Field(choices=choices) model_field = models.Field(choices=choices)
form_field = model_field.formfield(show_hidden_initial=True) form_field = model_field.formfield(show_hidden_initial=True)
self.assertTrue(form_field.show_hidden_initial) self.failUnless(form_field.show_hidden_initial)
form_field = model_field.formfield(show_hidden_initial=False) form_field = model_field.formfield(show_hidden_initial=False)
self.assertFalse(form_field.show_hidden_initial) self.failIf(form_field.show_hidden_initial)
class DecimalFieldTests(django.test.TestCase): class DecimalFieldTests(django.test.TestCase):
def test_to_python(self): def test_to_python(self):