mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-26 12:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

87
tests/regressiontests/text/tests.py
View file

@ -1,4 +1,5 @@
# coding: utf-8
from __future__ import unicode_literals
from django.test import TestCase
from django.utils.encoding import iri_to_uri
@ -14,72 +15,72 @@ class TextTests(TestCase):
"""
def test_get_text_list(self):
self.assertEqual(get_text_list(['a', 'b', 'c', 'd']), u'a, b, c or d')
self.assertEqual(get_text_list(['a', 'b', 'c'], 'and'), u'a, b and c')
self.assertEqual(get_text_list(['a', 'b'], 'and'), u'a and b')
self.assertEqual(get_text_list(['a']), u'a')
self.assertEqual(get_text_list([]), u'')
self.assertEqual(get_text_list(['a', 'b', 'c', 'd']), 'a, b, c or d')
self.assertEqual(get_text_list(['a', 'b', 'c'], 'and'), 'a, b and c')
self.assertEqual(get_text_list(['a', 'b'], 'and'), 'a and b')
self.assertEqual(get_text_list(['a']), 'a')
self.assertEqual(get_text_list([]), '')
with override('ar'):
self.assertEqual(get_text_list(['a', 'b', 'c']), u"a، b أو c")
self.assertEqual(get_text_list(['a', 'b', 'c']), "a، b أو c")
def test_smart_split(self):
self.assertEqual(list(smart_split(r'''This is "a person" test.''')),
[u'This', u'is', u'"a person"', u'test.'])
['This', 'is', '"a person"', 'test.'])
self.assertEqual(list(smart_split(r'''This is "a person's" test.'''))[2],
u'"a person\'s"')
'"a person\'s"')
self.assertEqual(list(smart_split(r'''This is "a person\"s" test.'''))[2],
u'"a person\\"s"')
'"a person\\"s"')
self.assertEqual(list(smart_split('''"a 'one''')), [u'"a', u"'one"])
self.assertEqual(list(smart_split('''"a 'one''')), ['"a', "'one"])
self.assertEqual(list(smart_split(r'''all friends' tests'''))[1],
"friends'")
self.assertEqual(list(smart_split(u'url search_page words="something else"')),
[u'url', u'search_page', u'words="something else"'])
self.assertEqual(list(smart_split('url search_page words="something else"')),
['url', 'search_page', 'words="something else"'])
self.assertEqual(list(smart_split(u"url search_page words='something else'")),
[u'url', u'search_page', u"words='something else'"])
self.assertEqual(list(smart_split("url search_page words='something else'")),
['url', 'search_page', "words='something else'"])
self.assertEqual(list(smart_split(u'url search_page words "something else"')),
[u'url', u'search_page', u'words', u'"something else"'])
self.assertEqual(list(smart_split('url search_page words "something else"')),
['url', 'search_page', 'words', '"something else"'])
self.assertEqual(list(smart_split(u'url search_page words-"something else"')),
[u'url', u'search_page', u'words-"something else"'])
self.assertEqual(list(smart_split('url search_page words-"something else"')),
['url', 'search_page', 'words-"something else"'])
self.assertEqual(list(smart_split(u'url search_page words=hello')),
[u'url', u'search_page', u'words=hello'])
self.assertEqual(list(smart_split('url search_page words=hello')),
['url', 'search_page', 'words=hello'])
self.assertEqual(list(smart_split(u'url search_page words="something else')),
[u'url', u'search_page', u'words="something', u'else'])
self.assertEqual(list(smart_split('url search_page words="something else')),
['url', 'search_page', 'words="something', 'else'])
self.assertEqual(list(smart_split("cut:','|cut:' '")),
[u"cut:','|cut:' '"])
["cut:','|cut:' '"])
def test_urlquote(self):
self.assertEqual(urlquote(u'Paris & Orl\xe9ans'),
u'Paris%20%26%20Orl%C3%A9ans')
self.assertEqual(urlquote(u'Paris & Orl\xe9ans', safe="&"),
u'Paris%20&%20Orl%C3%A9ans')
self.assertEqual(urlquote('Paris & Orl\xe9ans'),
'Paris%20%26%20Orl%C3%A9ans')
self.assertEqual(urlquote('Paris & Orl\xe9ans', safe="&"),
'Paris%20&%20Orl%C3%A9ans')
self.assertEqual(
urlunquote(u'Paris%20%26%20Orl%C3%A9ans'),
u'Paris & Orl\xe9ans')
urlunquote('Paris%20%26%20Orl%C3%A9ans'),
'Paris & Orl\xe9ans')
self.assertEqual(
urlunquote(u'Paris%20&%20Orl%C3%A9ans'),
u'Paris & Orl\xe9ans')
self.assertEqual(urlquote_plus(u'Paris & Orl\xe9ans'),
u'Paris+%26+Orl%C3%A9ans')
self.assertEqual(urlquote_plus(u'Paris & Orl\xe9ans', safe="&"),
u'Paris+&+Orl%C3%A9ans')
urlunquote('Paris%20&%20Orl%C3%A9ans'),
'Paris & Orl\xe9ans')
self.assertEqual(urlquote_plus('Paris & Orl\xe9ans'),
'Paris+%26+Orl%C3%A9ans')
self.assertEqual(urlquote_plus('Paris & Orl\xe9ans', safe="&"),
'Paris+&+Orl%C3%A9ans')
self.assertEqual(
urlunquote_plus(u'Paris+%26+Orl%C3%A9ans'),
u'Paris & Orl\xe9ans')
urlunquote_plus('Paris+%26+Orl%C3%A9ans'),
'Paris & Orl\xe9ans')
self.assertEqual(
urlunquote_plus(u'Paris+&+Orl%C3%A9ans'),
u'Paris & Orl\xe9ans')
urlunquote_plus('Paris+&+Orl%C3%A9ans'),
'Paris & Orl\xe9ans')
def test_cookie_date(self):
t = 1167616461.0
@ -90,15 +91,15 @@ class TextTests(TestCase):
self.assertEqual(http_date(t), 'Mon, 01 Jan 2007 01:54:21 GMT')
def test_iri_to_uri(self):
self.assertEqual(iri_to_uri(u'red%09ros\xe9#red'),
self.assertEqual(iri_to_uri('red%09ros\xe9#red'),
'red%09ros%C3%A9#red')
self.assertEqual(iri_to_uri(u'/blog/for/J\xfcrgen M\xfcnster/'),
self.assertEqual(iri_to_uri('/blog/for/J\xfcrgen M\xfcnster/'),
'/blog/for/J%C3%BCrgen%20M%C3%BCnster/')
self.assertEqual(iri_to_uri(u'locations/%s' % urlquote_plus(u'Paris & Orl\xe9ans')),
self.assertEqual(iri_to_uri('locations/%s' % urlquote_plus('Paris & Orl\xe9ans')),
'locations/Paris+%26+Orl%C3%A9ans')
def test_iri_to_uri_idempotent(self):
self.assertEqual(iri_to_uri(iri_to_uri(u'red%09ros\xe9#red')),
self.assertEqual(iri_to_uri(iri_to_uri('red%09ros\xe9#red')),
'red%09ros%C3%A9#red')