1
0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00

Fixed #18269 -- Applied unicode_literals for Python 3 compatibility.

Thanks Vinay Sajip for the support of his django3 branch and
Jannis Leidel for the review.
This commit is contained in:
Claude Paroz
2012-06-07 18:08:47 +02:00
parent 706fd9adc0
commit 4a103086d5
401 changed files with 6647 additions and 6157 deletions

View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import absolute_import, unicode_literals
from django.contrib.localflavor.mk.forms import (
MKIdentityCardNumberField, MKMunicipalitySelect, UMCNField)
@@ -41,7 +41,7 @@ class MKLocalFlavorTests(SimpleTestCase):
})
self.assertFalse(form.is_valid())
self.assertEqual(
form.errors['municipality_req'], [u'This field is required.'])
form.errors['municipality_req'], ['This field is required.'])
def test_umcn_invalid(self):
"""
@@ -56,7 +56,7 @@ class MKLocalFlavorTests(SimpleTestCase):
'id_number':'A1234567',
})
self.assertFalse(form.is_valid())
self.assertEqual(form.errors['umcn'], [u'The UMCN is not valid.'])
self.assertEqual(form.errors['umcn'], ['The UMCN is not valid.'])
form = MKPersonForm({
'first_name':'Someone',
@@ -67,7 +67,7 @@ class MKLocalFlavorTests(SimpleTestCase):
'id_number':'A1234567',
})
self.assertEqual(form.errors['umcn'],
[u'The first 7 digits of the UMCN must represent a valid past date.'])
['The first 7 digits of the UMCN must represent a valid past date.'])
def test_idnumber_invalid(self):
"""
@@ -85,8 +85,8 @@ class MKLocalFlavorTests(SimpleTestCase):
})
self.assertFalse(form.is_valid())
self.assertEqual(form.errors['id_number'],
[u'Identity card numbers must contain either 4 to 7 '
'digits or an uppercase letter and 7 digits.'])
['Identity card numbers must contain either 4 to 7 '
'digits or an uppercase letter and 7 digits.'])
def test_field_blank_option(self):
"""
@@ -183,7 +183,7 @@ class MKLocalFlavorTests(SimpleTestCase):
self.assertHTMLEqual(str(self.form['municipality']), municipality_select_html)
def test_MKIdentityCardNumberField(self):
error_invalid = [u'Identity card numbers must contain either 4 to 7 '
error_invalid = ['Identity card numbers must contain either 4 to 7 '
'digits or an uppercase letter and 7 digits.']
valid = {
'L0018077':'L0018077',
@@ -198,7 +198,7 @@ class MKLocalFlavorTests(SimpleTestCase):
def test_MKMunicipalitySelect(self):
f = MKMunicipalitySelect()
out=u'''<select name="municipality">
out='''<select name="municipality">
<option value="AD">Aerodrom</option>
<option value="AR">Ara\u010dinovo</option>
<option value="BR">Berovo</option>
@@ -287,10 +287,10 @@ class MKLocalFlavorTests(SimpleTestCase):
self.assertHTMLEqual(f.render('municipality', 'DL' ), out)
def test_UMCNField(self):
error_invalid = [u'This field should contain exactly 13 digits.']
error_checksum = [u'The UMCN is not valid.']
error_date = [u'The first 7 digits of the UMCN '
'must represent a valid past date.']
error_invalid = ['This field should contain exactly 13 digits.']
error_checksum = ['The UMCN is not valid.']
error_date = ['The first 7 digits of the UMCN '
'must represent a valid past date.']
valid = {
'2402983450006': '2402983450006',
'2803984430038': '2803984430038',