Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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.
  • Loading branch information...
commit 4a103086d5c67fa4fcc53c106c9fdf644c742dd8 1 parent 706fd9a
Claude Paroz authored June 07, 2012

Showing 301 changed files with 5,334 additions and 4,985 deletions. Show diff stats Hide diff stats

  1. 146  django/conf/locale/__init__.py
  2. 3  django/conf/locale/bg/formats.py
  3. 3  django/conf/locale/cs/formats.py
  4. 4  django/conf/locale/en/formats.py
  5. 3  django/conf/locale/es_MX/formats.py
  6. 3  django/conf/locale/et/formats.py
  7. 3  django/conf/locale/fi/formats.py
  8. 3  django/conf/locale/fr/formats.py
  9. 1  django/conf/locale/he/formats.py
  10. 3  django/conf/locale/hu/formats.py
  11. 1  django/conf/locale/ja/formats.py
  12. 1  django/conf/locale/km/formats.py
  13. 1  django/conf/locale/ko/formats.py
  14. 3  django/conf/locale/lv/formats.py
  15. 3  django/conf/locale/nb/formats.py
  16. 3  django/conf/locale/nn/formats.py
  17. 3  django/conf/locale/pl/formats.py
  18. 1  django/conf/locale/pt_BR/formats.py
  19. 3  django/conf/locale/ru/formats.py
  20. 3  django/conf/locale/sk/formats.py
  21. 3  django/conf/locale/sv/formats.py
  22. 4  django/conf/locale/uk/formats.py
  23. 1  django/conf/locale/vi/formats.py
  24. 5  django/contrib/admin/forms.py
  25. 18  django/contrib/admin/helpers.py
  26. 4  django/contrib/admin/models.py
  27. 18  django/contrib/admin/templatetags/admin_list.py
  28. 6  django/contrib/admin/util.py
  29. 36  django/contrib/admin/widgets.py
  30. 8  django/contrib/admindocs/tests/__init__.py
  31. 4  django/contrib/auth/backends.py
  32. 2  django/contrib/auth/hashers.py
  33. 8  django/contrib/auth/management/__init__.py
  34. 6  django/contrib/auth/models.py
  35. 10  django/contrib/auth/tests/auth_backends.py
  36. 6  django/contrib/auth/tests/forms.py
  37. 18  django/contrib/auth/tests/hashers.py
  38. 8  django/contrib/auth/tests/management.py
  39. 6  django/contrib/comments/admin.py
  40. 3  django/contrib/contenttypes/generic.py
  41. 4  django/contrib/contenttypes/tests.py
  42. 6  django/contrib/contenttypes/views.py
  43. 11  django/contrib/databrowse/datastructures.py
  44. 10  django/contrib/databrowse/plugins/calendars.py
  45. 10  django/contrib/databrowse/plugins/fieldchoices.py
  46. 4  django/contrib/databrowse/sites.py
  47. 4  django/contrib/flatpages/models.py
  48. 6  django/contrib/flatpages/tests/forms.py
  49. 58  django/contrib/formtools/tests/__init__.py
  50. 10  django/contrib/formtools/tests/wizard/forms.py
  51. 24  django/contrib/formtools/tests/wizard/namedwizardtests/tests.py
  52. 26  django/contrib/formtools/tests/wizard/wizardtests/tests.py
  53. 22  django/contrib/gis/feeds.py
  54. 10  django/contrib/gis/forms/fields.py
  55. 2  django/contrib/gis/gdal/tests/test_envelope.py
  56. 8  django/contrib/gis/geoip/tests.py
  57. 8  django/contrib/gis/sitemaps/views.py
  58. 6  django/contrib/gis/tests/geoapp/test_feeds.py
  59. 10  django/contrib/gis/tests/geoapp/test_sitemaps.py
  60. 6  django/contrib/gis/views.py
  61. 27  django/contrib/humanize/templatetags/humanize.py
  62. 11  django/contrib/humanize/tests.py
  63. 49  django/contrib/localflavor/ar/ar_provinces.py
  64. 12  django/contrib/localflavor/ar/forms.py
  65. 8  django/contrib/localflavor/at/forms.py
  66. 8  django/contrib/localflavor/au/forms.py
  67. 23  django/contrib/localflavor/br/br_states.py
  68. 16  django/contrib/localflavor/br/forms.py
  69. 22  django/contrib/localflavor/ca/forms.py
  70. 10  django/contrib/localflavor/ch/forms.py
  71. 31  django/contrib/localflavor/cl/cl_regions.py
  72. 10  django/contrib/localflavor/cl/forms.py
  73. 70  django/contrib/localflavor/cn/cn_provinces.py
  74. 20  django/contrib/localflavor/cn/forms.py
  75. 67  django/contrib/localflavor/co/co_departments.py
  76. 20  django/contrib/localflavor/cz/forms.py
  77. 8  django/contrib/localflavor/de/forms.py
  78. 4  django/contrib/localflavor/de_CH/formats.py
  79. 49  django/contrib/localflavor/ec/ec_provinces.py
  80. 4  django/contrib/localflavor/es/forms.py
  81. 688  django/contrib/localflavor/fi/fi_municipalities.py
  82. 6  django/contrib/localflavor/fi/forms.py
  83. 6  django/contrib/localflavor/fr/forms.py
  84. 219  django/contrib/localflavor/fr/fr_department.py
  85. 6  django/contrib/localflavor/gb/forms.py
  86. 6  django/contrib/localflavor/hk/forms.py
  87. 22  django/contrib/localflavor/hr/forms.py
  88. 54  django/contrib/localflavor/hr/hr_choices.py
  89. 12  django/contrib/localflavor/id/forms.py
  90. 7  django/contrib/localflavor/il/forms.py
  91. 14  django/contrib/localflavor/in_/forms.py
  92. 8  django/contrib/localflavor/is_/forms.py
  93. 295  django/contrib/localflavor/is_/is_postalcodes.py
  94. 12  django/contrib/localflavor/it/forms.py
  95. 3  django/contrib/localflavor/it/it_province.py
  96. 3  django/contrib/localflavor/it/it_region.py
  97. 4  django/contrib/localflavor/it/util.py
  98. 4  django/contrib/localflavor/kw/forms.py
  99. 14  django/contrib/localflavor/mk/forms.py
  100. 170  django/contrib/localflavor/mk/mk_choices.py
  101. 61  django/contrib/localflavor/mx/forms.py
  102. 65  django/contrib/localflavor/mx/mx_states.py
  103. 10  django/contrib/localflavor/nl/forms.py
  104. 6  django/contrib/localflavor/no/forms.py
  105. 43  django/contrib/localflavor/no/no_municipalities.py
  106. 6  django/contrib/localflavor/pe/forms.py
  107. 51  django/contrib/localflavor/pe/pe_region.py
  108. 36  django/contrib/localflavor/pl/forms.py
  109. 753  django/contrib/localflavor/pl/pl_administrativeunits.py
  110. 8  django/contrib/localflavor/pt/forms.py
  111. 73  django/contrib/localflavor/py/py_department.py
  112. 14  django/contrib/localflavor/ro/forms.py
  113. 85  django/contrib/localflavor/ro/ro_counties.py
  114. 8  django/contrib/localflavor/ru/forms.py
  115. 6  django/contrib/localflavor/se/forms.py
  116. 43  django/contrib/localflavor/se/se_counties.py
  117. 18  django/contrib/localflavor/si/forms.py
  118. 927  django/contrib/localflavor/si/si_postalcodes.py
  119. 4  django/contrib/localflavor/sk/forms.py
  120. 18  django/contrib/localflavor/tr/forms.py
  121. 12  django/contrib/localflavor/us/forms.py
  122. 4  django/contrib/localflavor/uy/forms.py
  123. 39  django/contrib/localflavor/uy/uy_departaments.py
  124. 7  django/contrib/localflavor/za/forms.py
  125. 4  django/contrib/messages/storage/base.py
  126. 10  django/contrib/sitemaps/tests/flatpages.py
  127. 4  django/contrib/sitemaps/tests/http.py
  128. 8  django/contrib/sites/tests.py
  129. 30  django/contrib/staticfiles/management/commands/collectstatic.py
  130. 8  django/contrib/staticfiles/management/commands/findstatic.py
  131. 11  django/contrib/staticfiles/storage.py
  132. 4  django/contrib/syndication/views.py
  133. 12  django/contrib/webdesign/lorem_ipsum.py
  134. 4  django/contrib/webdesign/templatetags/webdesign.py
  135. 5  django/contrib/webdesign/tests.py
  136. 3  django/core/context_processors.py
  137. 4  django/core/files/base.py
  138. 6  django/core/files/uploadhandler.py
  139. 8  django/core/handlers/base.py
  140. 12  django/core/handlers/wsgi.py
  141. 5  django/core/mail/__init__.py
  142. 8  django/core/mail/message.py
  143. 4  django/core/management/commands/createcachetable.py
  144. 5  django/core/management/commands/loaddata.py
  145. 4  django/core/management/commands/sql.py
  146. 4  django/core/management/commands/sqlall.py
  147. 4  django/core/management/commands/sqlclear.py
  148. 4  django/core/management/commands/sqlcustom.py
  149. 4  django/core/management/commands/sqlflush.py
  150. 4  django/core/management/commands/sqlindexes.py
  151. 4  django/core/management/commands/sqlsequencereset.py
  152. 6  django/core/management/sql.py
  153. 3  django/core/management/validation.py
  154. 5  django/core/serializers/json.py
  155. 3  django/core/serializers/python.py
  156. 4  django/core/serializers/xml_serializer.py
  157. 9  django/core/urlresolvers.py
  158. 32  django/core/validators.py
  159. 5  django/db/backends/mysql/base.py
  160. 10  django/db/backends/oracle/base.py
  161. 4  django/db/backends/postgresql_psycopg2/introspection.py
  162. 14  django/db/backends/postgresql_psycopg2/operations.py
  163. 7  django/db/backends/sqlite3/base.py
  164. 6  django/db/backends/util.py
  165. 8  django/db/models/base.py
  166. 60  django/db/models/fields/__init__.py
  167. 2  django/db/models/fields/files.py
  168. 3  django/forms/extras/widgets.py
  169. 72  django/forms/fields.py
  170. 36  django/forms/forms.py
  171. 22  django/forms/formsets.py
  172. 20  django/forms/models.py
  173. 22  django/forms/util.py
  174. 90  django/forms/widgets.py
  175. 8  django/http/__init__.py
  176. 14  django/http/multipartparser.py
  177. 8  django/template/base.py
  178. 81  django/template/defaultfilters.py
  179. 15  django/template/defaulttags.py
  180. 6  django/templatetags/cache.py
  181. 9  django/templatetags/i18n.py
  182. 2  django/test/client.py
  183. 19  django/test/html.py
  184. 52  django/test/testcases.py
  185. 2  django/test/utils.py
  186. 6  django/utils/crypto.py
  187. 37  django/utils/dateformat.py
  188. 6  django/utils/encoding.py
  189. 161  django/utils/feedgenerator.py
  190. 42  django/utils/html.py
  191. 33  django/utils/regex_helper.py
  192. 46  django/utils/text.py
  193. 4  django/utils/timesince.py
  194. 4  django/utils/translation/__init__.py
  195. 43  django/utils/translation/trans_real.py
  196. 4  django/utils/tzinfo.py
  197. 2  django/utils/version.py
  198. 6  django/views/debug.py
  199. 8  django/views/generic/base.py
  200. 20  django/views/generic/dates.py
  201. 14  django/views/generic/detail.py
  202. 10  django/views/generic/list.py
  203. 7  django/views/static.py
  204. 14  docs/conf.py
  205. 3  docs/ref/files/file.txt
  206. 2  docs/ref/forms/fields.txt
  207. 4  docs/ref/forms/validation.txt
  208. 44  docs/ref/unicode.txt
  209. 16  docs/topics/db/models.txt
  210. 4  docs/topics/i18n/translation.txt
  211. 100  tests/modeltests/aggregation/tests.py
  212. 14  tests/modeltests/basic/tests.py
  213. 4  tests/modeltests/custom_columns/models.py
  214. 4  tests/modeltests/custom_managers/models.py
  215. 4  tests/modeltests/custom_pk/models.py
  216. 4  tests/modeltests/custom_pk/tests.py
  217. 4  tests/modeltests/distinct_on_fields/models.py
  218. 4  tests/modeltests/distinct_on_fields/tests.py
  219. 3  tests/modeltests/expressions/models.py
  220. 20  tests/modeltests/expressions/tests.py
  221. 4  tests/modeltests/field_subclassing/fields.py
  222. 26  tests/modeltests/files/tests.py
  223. 26  tests/modeltests/fixtures_model_package/tests.py
  224. 4  tests/modeltests/generic_relations/models.py
  225. 52  tests/modeltests/generic_relations/tests.py
  226. 4  tests/modeltests/get_or_create/models.py
  227. 8  tests/modeltests/invalid_models/invalid_models/models.py
  228. 6  tests/modeltests/lookup/models.py
  229. 44  tests/modeltests/lookup/tests.py
  230. 3  tests/modeltests/m2m_and_m2o/models.py
  231. 5  tests/modeltests/m2m_intermediary/models.py
  232. 2  tests/modeltests/m2m_through/tests.py
  233. 3  tests/modeltests/many_to_one/models.py
  234. 6  tests/modeltests/many_to_one/tests.py
  235. 3  tests/modeltests/model_forms/models.py
  236. 226  tests/modeltests/model_forms/tests.py
  237. 10  tests/modeltests/model_formsets/models.py
  238. 82  tests/modeltests/model_formsets/tests.py
  239. 15  tests/modeltests/model_inheritance/models.py
  240. 9  tests/modeltests/one_to_one/models.py
  241. 8  tests/modeltests/pagination/tests.py
  242. 38  tests/modeltests/prefetch_related/tests.py
  243. 6  tests/modeltests/proxy_models/tests.py
  244. 3  tests/modeltests/save_delete_hooks/models.py
  245. 6  tests/modeltests/select_related/tests.py
  246. 5  tests/modeltests/serializers/models.py
  247. 6  tests/modeltests/serializers/tests.py
  248. 5  tests/modeltests/signals/models.py
  249. 4  tests/modeltests/str/tests.py
  250. 6  tests/modeltests/test_client/models.py
  251. 32  tests/modeltests/timezones/tests.py
  252. 3  tests/modeltests/transactions/models.py
  253. 10  tests/modeltests/update/tests.py
  254. 8  tests/modeltests/validation/models.py
  255. 70  tests/modeltests/validation/test_error_messages.py
  256. 14  tests/modeltests/validation/test_unique.py
  257. 4  tests/modeltests/validation/tests.py
  258. 4  tests/modeltests/validation/validators.py
  259. 15  tests/modeltests/validators/tests.py
  260. 8  tests/regressiontests/admin_custom_urls/tests.py
  261. 6  tests/regressiontests/admin_filters/models.py
  262. 92  tests/regressiontests/admin_filters/tests.py
  263. 6  tests/regressiontests/admin_inlines/models.py
  264. 10  tests/regressiontests/admin_inlines/tests.py
  265. 14  tests/regressiontests/admin_ordering/tests.py
  266. 4  tests/regressiontests/admin_util/tests.py
  267. 6  tests/regressiontests/admin_views/admin.py
  268. 40  tests/regressiontests/admin_views/models.py
  269. 267  tests/regressiontests/admin_views/tests.py
  270. 4  tests/regressiontests/admin_widgets/models.py
  271. 12  tests/regressiontests/admin_widgets/tests.py
  272. 84  tests/regressiontests/aggregation_regress/tests.py
  273. 6  tests/regressiontests/backends/models.py
  274. 8  tests/regressiontests/backends/tests.py
  275. 22  tests/regressiontests/cache/tests.py
  276. 6  tests/regressiontests/comment_tests/tests/comment_view_tests.py
  277. 9  tests/regressiontests/csrf_tests/tests.py
  278. 3  tests/regressiontests/custom_columns_regress/models.py
  279. 6  tests/regressiontests/datatypes/tests.py
  280. 649  tests/regressiontests/defaultfilters/tests.py
  281. 3  tests/regressiontests/expressions_regress/models.py
  282. 6  tests/regressiontests/extra_regress/models.py
  283. 36  tests/regressiontests/extra_regress/tests.py
  284. 8  tests/regressiontests/file_storage/tests.py
  285. 23  tests/regressiontests/file_uploads/tests.py
  286. 4  tests/regressiontests/file_uploads/views.py
  287. 10  tests/regressiontests/fixtures_regress/models.py
  288. 4  tests/regressiontests/fixtures_regress/tests.py
  289. 6  tests/regressiontests/forms/models.py
  290. 117  tests/regressiontests/forms/tests/error_messages.py
  291. 175  tests/regressiontests/forms/tests/extra.py
  292. 568  tests/regressiontests/forms/tests/fields.py
  293. 257  tests/regressiontests/forms/tests/forms.py
  294. 88  tests/regressiontests/forms/tests/formsets.py
  295. 18  tests/regressiontests/forms/tests/models.py
  296. 34  tests/regressiontests/forms/tests/regressions.py
  297. 16  tests/regressiontests/forms/tests/util.py
  298. 325  tests/regressiontests/forms/tests/widgets.py
  299. 41  tests/regressiontests/generic_inline_admin/tests.py
  300. 58  tests/regressiontests/httpwrappers/tests.py
146  django/conf/locale/__init__.py
... ...
@@ -1,434 +1,436 @@
  1
+from __future__ import unicode_literals
  2
+
1 3
 LANG_INFO = {
2 4
     'ar': {
3 5
         'bidi': True,
4 6
         'code': 'ar',
5 7
         'name': 'Arabic',
6  
-        'name_local': u'\u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629',
  8
+        'name_local': '\u0627\u0644\u0639\u0631\u0628\u064a\u0651\u0629',
7 9
     },
8 10
     'az': {
9 11
         'bidi': True,
10 12
         'code': 'az',
11 13
         'name': 'Azerbaijani',
12  
-        'name_local': u'az\u0259rbaycan dili',
  14
+        'name_local': 'az\u0259rbaycan dili',
13 15
     },
14 16
     'bg': {
15 17
         'bidi': False,
16 18
         'code': 'bg',
17 19
         'name': 'Bulgarian',
18  
-        'name_local': u'\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438',
  20
+        'name_local': '\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438',
19 21
     },
20 22
     'bn': {
21 23
         'bidi': False,
22 24
         'code': 'bn',
23 25
         'name': 'Bengali',
24  
-        'name_local': u'\u09ac\u09be\u0982\u09b2\u09be',
  26
+        'name_local': '\u09ac\u09be\u0982\u09b2\u09be',
25 27
     },
26 28
     'bs': {
27 29
         'bidi': False,
28 30
         'code': 'bs',
29 31
         'name': 'Bosnian',
30  
-        'name_local': u'bosanski',
  32
+        'name_local': 'bosanski',
31 33
     },
32 34
     'ca': {
33 35
         'bidi': False,
34 36
         'code': 'ca',
35 37
         'name': 'Catalan',
36  
-        'name_local': u'catal\xe0',
  38
+        'name_local': 'catal\xe0',
37 39
     },
38 40
     'cs': {
39 41
         'bidi': False,
40 42
         'code': 'cs',
41 43
         'name': 'Czech',
42  
-        'name_local': u'\u010desky',
  44
+        'name_local': '\u010desky',
43 45
     },
44 46
     'cy': {
45 47
         'bidi': False,
46 48
         'code': 'cy',
47 49
         'name': 'Welsh',
48  
-        'name_local': u'Cymraeg',
  50
+        'name_local': 'Cymraeg',
49 51
     },
50 52
     'da': {
51 53
         'bidi': False,
52 54
         'code': 'da',
53 55
         'name': 'Danish',
54  
-        'name_local': u'Dansk',
  56
+        'name_local': 'Dansk',
55 57
     },
56 58
     'de': {
57 59
         'bidi': False,
58 60
         'code': 'de',
59 61
         'name': 'German',
60  
-        'name_local': u'Deutsch',
  62
+        'name_local': 'Deutsch',
61 63
     },
62 64
     'el': {
63 65
         'bidi': False,
64 66
         'code': 'el',
65 67
         'name': 'Greek',
66  
-        'name_local': u'\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac',
  68
+        'name_local': '\u0395\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac',
67 69
     },
68 70
     'en': {
69 71
         'bidi': False,
70 72
         'code': 'en',
71 73
         'name': 'English',
72  
-        'name_local': u'English',
  74
+        'name_local': 'English',
73 75
     },
74 76
     'en-gb': {
75 77
         'bidi': False,
76 78
         'code': 'en-gb',
77 79
         'name': 'British English',
78  
-        'name_local': u'British English',
  80
+        'name_local': 'British English',
79 81
     },
80 82
     'eo': {
81 83
         'bidi': False,
82 84
         'code': 'eo',
83 85
         'name': 'Esperanto',
84  
-        'name_local': u'Esperanto',
  86
+        'name_local': 'Esperanto',
85 87
     },
86 88
     'es': {
87 89
         'bidi': False,
88 90
         'code': 'es',
89 91
         'name': 'Spanish',
90  
-        'name_local': u'espa\xf1ol',
  92
+        'name_local': 'espa\xf1ol',
91 93
     },
92 94
     'es-ar': {
93 95
         'bidi': False,
94 96
         'code': 'es-ar',
95 97
         'name': 'Argentinian Spanish',
96  
-        'name_local': u'espa\xf1ol de Argentina',
  98
+        'name_local': 'espa\xf1ol de Argentina',
97 99
     },
98 100
     'es-mx': {
99 101
         'bidi': False,
100 102
         'code': 'es-mx',
101 103
         'name': 'Mexican Spanish',
102  
-        'name_local': u'espa\xf1ol de Mexico',
  104
+        'name_local': 'espa\xf1ol de Mexico',
103 105
     },
104 106
     'es-ni': {
105 107
         'bidi': False,
106 108
         'code': 'es-ni',
107 109
         'name': 'Nicaraguan Spanish',
108  
-        'name_local': u'espa\xf1ol de Nicaragua',
  110
+        'name_local': 'espa\xf1ol de Nicaragua',
109 111
     },
110 112
     'et': {
111 113
         'bidi': False,
112 114
         'code': 'et',
113 115
         'name': 'Estonian',
114  
-        'name_local': u'eesti',
  116
+        'name_local': 'eesti',
115 117
     },
116 118
     'eu': {
117 119
         'bidi': False,
118 120
         'code': 'eu',
119 121
         'name': 'Basque',
120  
-        'name_local': u'Basque',
  122
+        'name_local': 'Basque',
121 123
     },
122 124
     'fa': {
123 125
         'bidi': True,
124 126
         'code': 'fa',
125 127
         'name': 'Persian',
126  
-        'name_local': u'\u0641\u0627\u0631\u0633\u06cc',
  128
+        'name_local': '\u0641\u0627\u0631\u0633\u06cc',
127 129
     },
128 130
     'fi': {
129 131
         'bidi': False,
130 132
         'code': 'fi',
131 133
         'name': 'Finnish',
132  
-        'name_local': u'suomi',
  134
+        'name_local': 'suomi',
133 135
     },
134 136
     'fr': {
135 137
         'bidi': False,
136 138
         'code': 'fr',
137 139
         'name': 'French',
138  
-        'name_local': u'Fran\xe7ais',
  140
+        'name_local': 'Fran\xe7ais',
139 141
     },
140 142
     'fy-nl': {
141 143
         'bidi': False,
142 144
         'code': 'fy-nl',
143 145
         'name': 'Frisian',
144  
-        'name_local': u'Frisian',
  146
+        'name_local': 'Frisian',
145 147
     },
146 148
     'ga': {
147 149
         'bidi': False,
148 150
         'code': 'ga',
149 151
         'name': 'Irish',
150  
-        'name_local': u'Gaeilge',
  152
+        'name_local': 'Gaeilge',
151 153
     },
152 154
     'gl': {
153 155
         'bidi': False,
154 156
         'code': 'gl',
155 157
         'name': 'Galician',
156  
-        'name_local': u'galego',
  158
+        'name_local': 'galego',
157 159
     },
158 160
     'he': {
159 161
         'bidi': True,
160 162
         'code': 'he',
161 163
         'name': 'Hebrew',
162  
-        'name_local': u'\u05e2\u05d1\u05e8\u05d9\u05ea',
  164
+        'name_local': '\u05e2\u05d1\u05e8\u05d9\u05ea',
163 165
     },
164 166
     'hi': {
165 167
         'bidi': False,
166 168
         'code': 'hi',
167 169
         'name': 'Hindi',
168  
-        'name_local': u'Hindi',
  170
+        'name_local': 'Hindi',
169 171
     },
170 172
     'hr': {
171 173
         'bidi': False,
172 174
         'code': 'hr',
173 175
         'name': 'Croatian',
174  
-        'name_local': u'Hrvatski',
  176
+        'name_local': 'Hrvatski',
175 177
     },
176 178
     'hu': {
177 179
         'bidi': False,
178 180
         'code': 'hu',
179 181
         'name': 'Hungarian',
180  
-        'name_local': u'Magyar',
  182
+        'name_local': 'Magyar',
181 183
     },
182 184
     'id': {
183 185
         'bidi': False,
184 186
         'code': 'id',
185 187
         'name': 'Indonesian',
186  
-        'name_local': u'Bahasa Indonesia',
  188
+        'name_local': 'Bahasa Indonesia',
187 189
     },
188 190
     'is': {
189 191
         'bidi': False,
190 192
         'code': 'is',
191 193
         'name': 'Icelandic',
192  
-        'name_local': u'\xcdslenska',
  194
+        'name_local': '\xcdslenska',
193 195
     },
194 196
     'it': {
195 197
         'bidi': False,
196 198
         'code': 'it',
197 199
         'name': 'Italian',
198  
-        'name_local': u'italiano',
  200
+        'name_local': 'italiano',
199 201
     },
200 202
     'ja': {
201 203
         'bidi': False,
202 204
         'code': 'ja',
203 205
         'name': 'Japanese',
204  
-        'name_local': u'\u65e5\u672c\u8a9e',
  206
+        'name_local': '\u65e5\u672c\u8a9e',
205 207
     },
206 208
     'ka': {
207 209
         'bidi': False,
208 210
         'code': 'ka',
209 211
         'name': 'Georgian',
210  
-        'name_local': u'\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8',
  212
+        'name_local': '\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8',
211 213
     },
212 214
     'kk': {
213 215
         'bidi': False,
214 216
         'code': 'kk',
215 217
         'name': 'Kazakh',
216  
-        'name_local': u'\u049a\u0430\u0437\u0430\u049b',
  218
+        'name_local': '\u049a\u0430\u0437\u0430\u049b',
217 219
     },
218 220
     'km': {
219 221
         'bidi': False,
220 222
         'code': 'km',
221 223
         'name': 'Khmer',
222  
-        'name_local': u'Khmer',
  224
+        'name_local': 'Khmer',
223 225
     },
224 226
     'kn': {
225 227
         'bidi': False,
226 228
         'code': 'kn',
227 229
         'name': 'Kannada',
228  
-        'name_local': u'Kannada',
  230
+        'name_local': 'Kannada',
229 231
     },
230 232
     'ko': {
231 233
         'bidi': False,
232 234
         'code': 'ko',
233 235
         'name': 'Korean',
234  
-        'name_local': u'\ud55c\uad6d\uc5b4',
  236
+        'name_local': '\ud55c\uad6d\uc5b4',
235 237
     },
236 238
     'lt': {
237 239
         'bidi': False,
238 240
         'code': 'lt',
239 241
         'name': 'Lithuanian',
240  
-        'name_local': u'Lithuanian',
  242
+        'name_local': 'Lithuanian',
241 243
     },
242 244
     'lv': {
243 245
         'bidi': False,
244 246
         'code': 'lv',
245 247
         'name': 'Latvian',
246  
-        'name_local': u'latvie\u0161u',
  248
+        'name_local': 'latvie\u0161u',
247 249
     },
248 250
     'mk': {
249 251
         'bidi': False,
250 252
         'code': 'mk',
251 253
         'name': 'Macedonian',
252  
-        'name_local': u'\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438',
  254
+        'name_local': '\u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0441\u043a\u0438',
253 255
     },
254 256
     'ml': {
255 257
         'bidi': False,
256 258
         'code': 'ml',
257 259
         'name': 'Malayalam',
258  
-        'name_local': u'Malayalam',
  260
+        'name_local': 'Malayalam',
259 261
     },
260 262
     'mn': {
261 263
         'bidi': False,
262 264
         'code': 'mn',
263 265
         'name': 'Mongolian',
264  
-        'name_local': u'Mongolian',
  266
+        'name_local': 'Mongolian',
265 267
     },
266 268
     'nb': {
267 269
         'bidi': False,
268 270
         'code': 'nb',
269 271
         'name': 'Norwegian Bokmal',
270  
-        'name_local': u'Norsk (bokm\xe5l)',
  272
+        'name_local': 'Norsk (bokm\xe5l)',
271 273
     },
272 274
     'ne': {
273 275
         'bidi': False,
274 276
         'code': 'ne',
275 277
         'name': 'Nepali',
276  
-        'name_local': u'\u0928\u0947\u092a\u093e\u0932\u0940',
  278
+        'name_local': '\u0928\u0947\u092a\u093e\u0932\u0940',
277 279
     },
278 280
     'nl': {
279 281
         'bidi': False,
280 282
         'code': 'nl',
281 283
         'name': 'Dutch',
282  
-        'name_local': u'Nederlands',
  284
+        'name_local': 'Nederlands',
283 285
     },
284 286
     'nn': {
285 287
         'bidi': False,
286 288
         'code': 'nn',
287 289
         'name': 'Norwegian Nynorsk',
288  
-        'name_local': u'Norsk (nynorsk)',
  290
+        'name_local': 'Norsk (nynorsk)',
289 291
     },
290 292
     'no': {
291 293
         'bidi': False,
292 294
         'code': 'no',
293 295
         'name': 'Norwegian',
294  
-        'name_local': u'Norsk',
  296
+        'name_local': 'Norsk',
295 297
     },
296 298
     'pa': {
297 299
         'bidi': False,
298 300
         'code': 'pa',
299 301
         'name': 'Punjabi',
300  
-        'name_local': u'Punjabi',
  302
+        'name_local': 'Punjabi',
301 303
     },
302 304
     'pl': {
303 305
         'bidi': False,
304 306
         'code': 'pl',
305 307
         'name': 'Polish',
306  
-        'name_local': u'polski',
  308
+        'name_local': 'polski',
307 309
     },
308 310
     'pt': {
309 311
         'bidi': False,
310 312
         'code': 'pt',
311 313
         'name': 'Portuguese',
312  
-        'name_local': u'Portugu\xeas',
  314
+        'name_local': 'Portugu\xeas',
313 315
     },
314 316
     'pt-br': {
315 317
         'bidi': False,
316 318
         'code': 'pt-br',
317 319
         'name': 'Brazilian Portuguese',
318  
-        'name_local': u'Portugu\xeas Brasileiro',
  320
+        'name_local': 'Portugu\xeas Brasileiro',
319 321
     },
320 322
     'ro': {
321 323
         'bidi': False,
322 324
         'code': 'ro',
323 325
         'name': 'Romanian',
324  
-        'name_local': u'Rom\xe2n\u0103',
  326
+        'name_local': 'Rom\xe2n\u0103',
325 327
     },
326 328
     'ru': {
327 329
         'bidi': False,
328 330
         'code': 'ru',
329 331
         'name': 'Russian',
330  
-        'name_local': u'\u0420\u0443\u0441\u0441\u043a\u0438\u0439',
  332
+        'name_local': '\u0420\u0443\u0441\u0441\u043a\u0438\u0439',
331 333
     },
332 334
     'sk': {
333 335
         'bidi': False,
334 336
         'code': 'sk',
335 337
         'name': 'Slovak',
336  
-        'name_local': u'slovensk\xfd',
  338
+        'name_local': 'slovensk\xfd',
337 339
     },
338 340
     'sl': {
339 341
         'bidi': False,
340 342
         'code': 'sl',
341 343
         'name': 'Slovenian',
342  
-        'name_local': u'Sloven\u0161\u010dina',
  344
+        'name_local': 'Sloven\u0161\u010dina',
343 345
     },
344 346
     'sq': {
345 347
         'bidi': False,
346 348
         'code': 'sq',
347 349
         'name': 'Albanian',
348  
-        'name_local': u'Albanian',
  350
+        'name_local': 'Albanian',
349 351
     },
350 352
     'sr': {
351 353
         'bidi': False,
352 354
         'code': 'sr',
353 355
         'name': 'Serbian',
354  
-        'name_local': u'\u0441\u0440\u043f\u0441\u043a\u0438',
  356
+        'name_local': '\u0441\u0440\u043f\u0441\u043a\u0438',
355 357
     },
356 358
     'sr-latn': {
357 359
         'bidi': False,
358 360
         'code': 'sr-latn',
359 361
         'name': 'Serbian Latin',
360  
-        'name_local': u'srpski (latinica)',
  362
+        'name_local': 'srpski (latinica)',
361 363
     },
362 364
     'sv': {
363 365
         'bidi': False,
364 366
         'code': 'sv',
365 367
         'name': 'Swedish',
366  
-        'name_local': u'Svenska',
  368
+        'name_local': 'Svenska',
367 369
     },
368 370
     'sw': {
369 371
         'bidi': False,
370 372
         'code': 'sw',
371 373
         'name': 'Swahili',
372  
-        'name_local': u'Kiswahili',
  374
+        'name_local': 'Kiswahili',
373 375
     },
374 376
     'ta': {
375 377
         'bidi': False,
376 378
         'code': 'ta',
377 379
         'name': 'Tamil',
378  
-        'name_local': u'\u0ba4\u0bae\u0bbf\u0bb4\u0bcd',
  380
+        'name_local': '\u0ba4\u0bae\u0bbf\u0bb4\u0bcd',
379 381
     },
380 382
     'te': {
381 383
         'bidi': False,
382 384
         'code': 'te',
383 385
         'name': 'Telugu',
384  
-        'name_local': u'\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41',
  386
+        'name_local': '\u0c24\u0c46\u0c32\u0c41\u0c17\u0c41',
385 387
     },
386 388
     'th': {
387 389
         'bidi': False,
388 390
         'code': 'th',
389 391
         'name': 'Thai',
390  
-        'name_local': u'Thai',
  392
+        'name_local': 'Thai',
391 393
     },
392 394
     'tr': {
393 395
         'bidi': False,
394 396
         'code': 'tr',
395 397
         'name': 'Turkish',
396  
-        'name_local': u'T\xfcrk\xe7e',
  398
+        'name_local': 'T\xfcrk\xe7e',
397 399
     },
398 400
     'tt': {
399 401
         'bidi': False,
400 402
         'code': 'tt',
401 403
         'name': 'Tatar',
402  
-        'name_local': u'\u0422\u0430\u0442\u0430\u0440\u0447\u0430',
  404
+        'name_local': '\u0422\u0430\u0442\u0430\u0440\u0447\u0430',
403 405
     },
404 406
     'uk': {
405 407
         'bidi': False,
406 408
         'code': 'uk',
407 409
         'name': 'Ukrainian',
408  
-        'name_local': u'\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430',
  410
+        'name_local': '\u0423\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430',
409 411
     },
410 412
     'ur': {
411 413
         'bidi': False,
412 414
         'code': 'ur',
413 415
         'name': 'Urdu',
414  
-        'name_local': u'\u0627\u0631\u062f\u0648',
  416
+        'name_local': '\u0627\u0631\u062f\u0648',
415 417
     },
416 418
     'vi': {
417 419
         'bidi': False,
418 420
         'code': 'vi',
419 421
         'name': 'Vietnamese',
420  
-        'name_local': u'Vietnamese',
  422
+        'name_local': 'Vietnamese',
421 423
     },
422 424
     'zh-cn': {
423 425
         'bidi': False,
424 426
         'code': 'zh-cn',
425 427
         'name': 'Simplified Chinese',
426  
-        'name_local': u'\u7b80\u4f53\u4e2d\u6587',
  428
+        'name_local': '\u7b80\u4f53\u4e2d\u6587',
427 429
     },
428 430
     'zh-tw': {
429 431
         'bidi': False,
430 432
         'code': 'zh-tw',
431 433
         'name': 'Traditional Chinese',
432  
-        'name_local': u'\u7e41\u9ad4\u4e2d\u6587',
  434
+        'name_local': '\u7e41\u9ad4\u4e2d\u6587',
433 435
     }
434 436
 }
3  django/conf/locale/bg/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -19,5 +20,5 @@
19 20
 # TIME_INPUT_FORMATS = 
20 21
 # DATETIME_INPUT_FORMATS = 
21 22
 DECIMAL_SEPARATOR = ','
22  
-THOUSAND_SEPARATOR = u' ' # Non-breaking space
  23
+THOUSAND_SEPARATOR = ' ' # Non-breaking space
23 24
 # NUMBER_GROUPING = 
3  django/conf/locale/cs/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -33,5 +34,5 @@
33 34
     '%Y-%m-%d',             # '2006-10-25'
34 35
 )
35 36
 DECIMAL_SEPARATOR = ','
36  
-THOUSAND_SEPARATOR = u'\xa0' # non-breaking space
  37
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
37 38
 NUMBER_GROUPING = 3
4  django/conf/locale/en/formats.py
@@ -37,7 +37,7 @@
37 37
     '%m/%d/%y %H:%M',        # '10/25/06 14:30'
38 38
     '%m/%d/%y',              # '10/25/06'
39 39
 )
40  
-DECIMAL_SEPARATOR = u'.'
41  
-THOUSAND_SEPARATOR = u','
  40
+DECIMAL_SEPARATOR = '.'
  41
+THOUSAND_SEPARATOR = ','
42 42
 NUMBER_GROUPING = 3
43 43
 
3  django/conf/locale/es_MX/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 DATE_FORMAT = r'j \d\e F \d\e Y'
6 7
 TIME_FORMAT = 'H:i:s'
@@ -24,5 +25,5 @@
24 25
     '%d/%m/%y %H:%M',
25 26
 )
26 27
 DECIMAL_SEPARATOR = '.'   # ',' is also official (less common): NOM-008-SCFI-2002
27  
-THOUSAND_SEPARATOR = u'\xa0' # non-breaking space
  28
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
28 29
 NUMBER_GROUPING = 3
3  django/conf/locale/et/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -19,5 +20,5 @@
19 20
 # TIME_INPUT_FORMATS = 
20 21
 # DATETIME_INPUT_FORMATS = 
21 22
 DECIMAL_SEPARATOR = ','
22  
-THOUSAND_SEPARATOR = u' ' # Non-breaking space
  23
+THOUSAND_SEPARATOR = ' ' # Non-breaking space
23 24
 # NUMBER_GROUPING = 
3  django/conf/locale/fi/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -19,5 +20,5 @@
19 20
 # TIME_INPUT_FORMATS = 
20 21
 # DATETIME_INPUT_FORMATS = 
21 22
 DECIMAL_SEPARATOR = ','
22  
-THOUSAND_SEPARATOR = u' ' # Non-breaking space
  23
+THOUSAND_SEPARATOR = ' ' # Non-breaking space
23 24
 # NUMBER_GROUPING = 
3  django/conf/locale/fr/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -37,5 +38,5 @@
37 38
     '%Y-%m-%d',             # '2006-10-25'
38 39
 )
39 40
 DECIMAL_SEPARATOR = ','
40  
-THOUSAND_SEPARATOR = u'\xa0' # non-breaking space
  41
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
41 42
 NUMBER_GROUPING = 3
1  django/conf/locale/he/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
3  django/conf/locale/hu/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -28,5 +29,5 @@
28 29
     '%Y.%m.%d.',            # '2006.10.25.'
29 30
 )
30 31
 DECIMAL_SEPARATOR = ','
31  
-THOUSAND_SEPARATOR = u' ' # Non-breaking space
  32
+THOUSAND_SEPARATOR = ' ' # Non-breaking space
32 33
 NUMBER_GROUPING = 3
1  django/conf/locale/ja/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
1  django/conf/locale/km/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
1  django/conf/locale/ko/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
3  django/conf/locale/lv/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -37,5 +38,5 @@
37 38
     '%d.%m.%y',              # '25.10.06'
38 39
 )
39 40
 DECIMAL_SEPARATOR = ','
40  
-THOUSAND_SEPARATOR = u' ' # Non-breaking space
  41
+THOUSAND_SEPARATOR = ' ' # Non-breaking space
41 42
 NUMBER_GROUPING = 3
3  django/conf/locale/nb/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -39,5 +40,5 @@
39 40
     '%d.%m.%y',              # '25.10.06'
40 41
 )
41 42
 DECIMAL_SEPARATOR = ','
42  
-THOUSAND_SEPARATOR = u'\xa0' # non-breaking space
  43
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
43 44
 NUMBER_GROUPING = 3
3  django/conf/locale/nn/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -39,5 +40,5 @@
39 40
     '%d.%m.%y',              # '25.10.06'
40 41
 )
41 42
 DECIMAL_SEPARATOR = ','
42  
-THOUSAND_SEPARATOR = u'\xa0' # non-breaking space
  43
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
43 44
 NUMBER_GROUPING = 3
3  django/conf/locale/pl/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -33,5 +34,5 @@
33 34
     '%Y-%m-%d',             # '2006-10-25'
34 35
 )
35 36
 DECIMAL_SEPARATOR = ','
36  
-THOUSAND_SEPARATOR = u' '
  37
+THOUSAND_SEPARATOR = ' '
37 38
 NUMBER_GROUPING = 3
1  django/conf/locale/pt_BR/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
3  django/conf/locale/ru/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -36,5 +37,5 @@
36 37
     '%Y-%m-%d',           # '2006-10-25'
37 38
 )
38 39
 DECIMAL_SEPARATOR = ','
39  
-THOUSAND_SEPARATOR = u'\xa0' # non-breaking space
  40
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
40 41
 NUMBER_GROUPING = 3
3  django/conf/locale/sk/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -33,5 +34,5 @@
33 34
     '%Y-%m-%d',             # '2006-10-25'
34 35
 )
35 36
 DECIMAL_SEPARATOR = ','
36  
-THOUSAND_SEPARATOR = u'\xa0' # non-breaking space
  37
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
37 38
 NUMBER_GROUPING = 3
3  django/conf/locale/sv/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
@@ -36,5 +37,5 @@
36 37
     '%m/%d/%y',              # '10/25/06'
37 38
 )
38 39
 DECIMAL_SEPARATOR = ','
39  
-THOUSAND_SEPARATOR = u'\xa0' # non-breaking space
  40
+THOUSAND_SEPARATOR = '\xa0' # non-breaking space
40 41
 NUMBER_GROUPING = 3
4  django/conf/locale/uk/formats.py
@@ -2,6 +2,8 @@
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
4 4
 
  5
+from __future__ import unicode_literals
  6
+
5 7
 # The *_FORMAT strings use the Django date format syntax,
6 8
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
7 9
 DATE_FORMAT = 'j E Y р.'
@@ -19,5 +21,5 @@
19 21
 # TIME_INPUT_FORMATS = 
20 22
 # DATETIME_INPUT_FORMATS = 
21 23
 DECIMAL_SEPARATOR = ','
22  
-THOUSAND_SEPARATOR = u' '
  24
+THOUSAND_SEPARATOR = ' '
23 25
 # NUMBER_GROUPING = 
1  django/conf/locale/vi/formats.py
... ...
@@ -1,6 +1,7 @@
1 1
 # -*- encoding: utf-8 -*-
2 2
 # This file is distributed under the same license as the Django package.
3 3
 #
  4
+from __future__ import unicode_literals
4 5
 
5 6
 # The *_FORMAT strings use the Django date format syntax,
6 7
 # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
5  django/contrib/admin/forms.py
... ...
@@ -1,9 +1,10 @@
  1
+from __future__ import unicode_literals
  2
+
1 3
 from django import forms
2 4
 
3 5
 from django.contrib.auth import authenticate
4 6
 from django.contrib.auth.forms import AuthenticationForm
5 7
 from django.contrib.auth.models import User
6  
-
7 8
 from django.utils.translation import ugettext_lazy, ugettext as _
8 9
 
9 10
 ERROR_MESSAGE = ugettext_lazy("Please enter the correct username and password "
@@ -25,7 +26,7 @@ def clean(self):
25 26
         if username and password:
26 27
             self.user_cache = authenticate(username=username, password=password)
27 28
             if self.user_cache is None:
28  
-                if u'@' in username:
  29
+                if '@' in username:
29 30
                     # Mistakenly entered e-mail address instead of username? Look it up.
30 31
                     try:
31 32
                         user = User.objects.get(email=username)
18  django/contrib/admin/helpers.py
... ...
@@ -1,3 +1,5 @@
  1
+from __future__ import unicode_literals
  2
+
1 3
 from django import forms
2 4
 from django.contrib.admin.util import (flatten_fieldsets, lookup_field,
3 5
     display_for_field, label_for_field, help_text_for_field)
@@ -69,7 +71,7 @@ def __init__(self, form, name=None, readonly_fields=(), fields=(), classes=(),
69 71
       description=None, model_admin=None):
70 72
         self.form = form
71 73
         self.name, self.fields = name, fields
72  
-        self.classes = u' '.join(classes)
  74
+        self.classes = ' '.join(classes)
73 75
         self.description = description
74 76
         self.model_admin = model_admin
75 77
         self.readonly_fields = readonly_fields
@@ -109,7 +111,7 @@ def __iter__(self):
109 111
                 yield AdminField(self.form, field, is_first=(i == 0))
110 112
 
111 113
     def errors(self):
112  
-        return mark_safe(u'\n'.join([self.form[f].errors.as_ul() for f in self.fields if f not in self.readonly_fields]).strip('\n'))
  114
+        return mark_safe('\n'.join([self.form[f].errors.as_ul() for f in self.fields if f not in self.readonly_fields]).strip('\n'))
113 115
 
114 116
 class AdminField(object):
115 117
     def __init__(self, form, field, is_first):
@@ -121,14 +123,14 @@ def label_tag(self):
121 123
         classes = []
122 124
         contents = conditional_escape(force_unicode(self.field.label))
123 125
         if self.is_checkbox:
124  
-            classes.append(u'vCheckboxLabel')
  126
+            classes.append('vCheckboxLabel')
125 127
         else:
126  
-            contents += u':'
  128
+            contents += ':'
127 129
         if self.field.field.required:
128  
-            classes.append(u'required')
  130
+            classes.append('required')
129 131
         if not self.is_first:
130  
-            classes.append(u'inline')
131  
-        attrs = classes and {'class': u' '.join(classes)} or {}
  132
+            classes.append('inline')
  133
+        attrs = classes and {'class': ' '.join(classes)} or {}
132 134
         return self.field.label_tag(contents=mark_safe(contents), attrs=attrs)
133 135
 
134 136
     def errors(self):
@@ -161,7 +163,7 @@ def label_tag(self):
161 163
         if not self.is_first:
162 164
             attrs["class"] = "inline"
163 165
         label = self.field['label']
164  
-        contents = capfirst(force_unicode(escape(label))) + u":"
  166
+        contents = capfirst(force_unicode(escape(label))) + ":"
165 167
         return mark_safe('<label%(attrs)s>%(contents)s</label>' % {
166 168
             "attrs": flatatt(attrs),
167 169
             "contents": contents,
4  django/contrib/admin/models.py
... ...
@@ -1,3 +1,5 @@
  1
+from __future__ import unicode_literals
  2
+
1 3
 from django.db import models
2 4
 from django.contrib.contenttypes.models import ContentType
3 5
 from django.contrib.auth.models import User
@@ -64,5 +66,5 @@ def get_admin_url(self):
64 66
         This is relative to the Django admin index page.
65 67
         """
66 68
         if self.content_type and self.object_id:
67  
-            return mark_safe(u"%s/%s/%s/" % (self.content_type.app_label, self.content_type.model, quote(self.object_id)))
  69
+            return mark_safe("%s/%s/%s/" % (self.content_type.app_label, self.content_type.model, quote(self.object_id)))
68 70
         return None
18  django/contrib/admin/templatetags/admin_list.py
... ...
@@ -1,3 +1,5 @@
  1
+from __future__ import unicode_literals
  2
+
1 3
 import datetime
2 4
 
3 5
 from django.contrib.admin.util import (lookup_field, display_for_field,
@@ -27,11 +29,11 @@ def paginator_number(cl,i):
27 29
     Generates an individual page index link in a paginated list.
28 30
     """
29 31
     if i == DOT:
30  
-        return u'... '
  32
+        return '... '
31 33
     elif i == cl.page_num:
32  
-        return mark_safe(u'<span class="this-page">%d</span> ' % (i+1))
  34
+        return mark_safe('<span class="this-page">%d</span> ' % (i+1))
33 35
     else:
34  
-        return mark_safe(u'<a href="%s"%s>%d</a> ' % (escape(cl.get_query_string({PAGE_VAR: i})), (i == cl.paginator.num_pages-1 and ' class="end"' or ''), i+1))
  36
+        return mark_safe('<a href="%s"%s>%d</a> ' % (escape(cl.get_query_string({PAGE_VAR: i})), (i == cl.paginator.num_pages-1 and ' class="end"' or ''), i+1))
35 37
 
36 38
 @register.inclusion_tag('admin/pagination.html')
37 39
 def pagination(cl):
@@ -163,7 +165,7 @@ def result_headers(cl):
163 165
 def _boolean_icon(field_val):
164 166
     icon_url = static('admin/img/icon-%s.gif' %
165 167
                       {True: 'yes', False: 'no', None: 'unknown'}[field_val])
166  
-    return mark_safe(u'<img src="%s" alt="%s" />' % (icon_url, field_val))
  168
+    return mark_safe('<img src="%s" alt="%s" />' % (icon_url, field_val))
167 169
 
168 170
 def items_for_result(cl, result, form):
169 171
     """
@@ -179,7 +181,7 @@ def items_for_result(cl, result, form):
179 181
             result_repr = EMPTY_CHANGELIST_VALUE
180 182
         else:
181 183
             if f is None:
182  
-                if field_name == u'action_checkbox':
  184
+                if field_name == 'action_checkbox':
183 185
                     row_class = ' class="action-checkbox"'