angler-fishThe Vulnerability History Project

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.
by Nick the Sea Slug 2012-06-07 16:08:47 UTC
commit 4a103086d5c67fa4fcc53c106c9fdf644c742dd8
Django VCC CVE-2013-4315
django/conf/locale/__init__.py
+72 -74
django/conf/locale/bg/formats.py
+1 -2
django/conf/locale/cs/formats.py
+1 -2
django/conf/locale/en/formats.py
+2 -2
django/conf/locale/es_MX/formats.py
+1 -2
django/conf/locale/et/formats.py
+1 -2
django/conf/locale/fi/formats.py
+1 -2
django/conf/locale/fr/formats.py
+1 -2
django/conf/locale/he/formats.py
-1
django/conf/locale/hu/formats.py
+1 -2
django/conf/locale/ja/formats.py
-1
django/conf/locale/km/formats.py
-1
django/conf/locale/ko/formats.py
-1
django/conf/locale/lv/formats.py
+1 -2
django/conf/locale/nb/formats.py
+1 -2
django/conf/locale/nn/formats.py
+1 -2
django/conf/locale/pl/formats.py
+1 -2
django/conf/locale/pt_BR/formats.py
-1
django/conf/locale/ru/formats.py
+1 -2
django/conf/locale/sk/formats.py
+1 -2
django/conf/locale/sv/formats.py
+1 -2
django/conf/locale/uk/formats.py
+1 -3
django/conf/locale/vi/formats.py
-1
django/contrib/admin/forms.py
+2 -3
django/contrib/admin/helpers.py
+8 -10
django/contrib/admin/models.py
+1 -3
django/contrib/admin/templatetags/admin_list.py
+8 -10
django/contrib/admin/util.py
+2 -4
django/contrib/admin/widgets.py
+17 -19
django/contrib/admindocs/tests/__init__.py
+4 -4
django/contrib/auth/backends.py
+1 -3
django/contrib/auth/hashers.py
-2
django/contrib/auth/management/__init__.py
+3 -5
django/contrib/auth/models.py
+2 -4
django/contrib/auth/tests/auth_backends.py
+4 -6
django/contrib/auth/tests/forms.py
+2 -4
django/contrib/auth/tests/hashers.py
+8 -10
django/contrib/auth/tests/management.py
+3 -5
django/contrib/comments/admin.py
+2 -4
django/contrib/contenttypes/generic.py
+1 -2
django/contrib/contenttypes/tests.py
+1 -3
django/contrib/contenttypes/views.py
+2 -4
django/contrib/databrowse/datastructures.py
+5 -6
django/contrib/databrowse/plugins/calendars.py
+4 -6
django/contrib/databrowse/plugins/fieldchoices.py
+4 -6
django/contrib/databrowse/sites.py
+1 -3
django/contrib/flatpages/models.py
+1 -3
django/contrib/flatpages/tests/forms.py
+2 -4
django/contrib/formtools/tests/__init__.py
+28 -30
django/contrib/formtools/tests/wizard/forms.py
+4 -6
django/contrib/formtools/tests/wizard/namedwizardtests/tests.py
+11 -13
django/contrib/formtools/tests/wizard/wizardtests/tests.py
+12 -14
django/contrib/gis/feeds.py
+10 -12
django/contrib/gis/forms/fields.py
+4 -6
django/contrib/gis/gdal/tests/test_envelope.py
+1 -1
django/contrib/gis/geoip/tests.py
+3 -5
django/contrib/gis/sitemaps/views.py
+3 -5
django/contrib/gis/tests/geoapp/test_feeds.py
+3 -3
django/contrib/gis/tests/geoapp/test_sitemaps.py
+5 -5
django/contrib/gis/views.py
+2 -4
django/contrib/humanize/templatetags/humanize.py
+13 -14
django/contrib/humanize/tests.py
+5 -6
django/contrib/localflavor/ar/ar_provinces.py
+24 -25
django/contrib/localflavor/ar/forms.py
+6 -6
django/contrib/localflavor/at/forms.py
+4 -4
django/contrib/localflavor/au/forms.py
+4 -4
django/contrib/localflavor/br/br_states.py
+11 -12
django/contrib/localflavor/br/forms.py
+8 -8
django/contrib/localflavor/ca/forms.py
+11 -11
django/contrib/localflavor/ch/forms.py
+5 -5
django/contrib/localflavor/cl/cl_regions.py
+15 -16
django/contrib/localflavor/cl/forms.py
+5 -5
django/contrib/localflavor/cn/cn_provinces.py
+35 -35
django/contrib/localflavor/cn/forms.py
+10 -10
django/contrib/localflavor/co/co_departments.py
+33 -34
django/contrib/localflavor/cz/forms.py
+10 -10
django/contrib/localflavor/de/forms.py
+4 -4
django/contrib/localflavor/de_CH/formats.py
+1 -3
django/contrib/localflavor/ec/ec_provinces.py
+24 -25
django/contrib/localflavor/es/forms.py
+2 -2
django/contrib/localflavor/fi/fi_municipalities.py
+343 -345
django/contrib/localflavor/fi/forms.py
+3 -3
django/contrib/localflavor/fr/forms.py
+3 -3
django/contrib/localflavor/fr/fr_department.py
+109 -110
django/contrib/localflavor/gb/forms.py
+3 -3
django/contrib/localflavor/hk/forms.py
+3 -3
django/contrib/localflavor/hr/forms.py
+11 -11
django/contrib/localflavor/hr/hr_choices.py
+26 -28
django/contrib/localflavor/id/forms.py
+6 -6
django/contrib/localflavor/il/forms.py
+3 -4
django/contrib/localflavor/in_/forms.py
+7 -7
django/contrib/localflavor/is_/forms.py
+4 -4
django/contrib/localflavor/is_/is_postalcodes.py
+147 -148
django/contrib/localflavor/it/forms.py
+6 -6
django/contrib/localflavor/it/it_province.py
+1 -2
django/contrib/localflavor/it/it_region.py
+1 -2
django/contrib/localflavor/it/util.py
+2 -2
django/contrib/localflavor/kw/forms.py
+1 -3
django/contrib/localflavor/mk/forms.py
+7 -7
django/contrib/localflavor/mk/mk_choices.py
+84 -86
django/contrib/localflavor/mx/forms.py
+30 -31
django/contrib/localflavor/mx/mx_states.py
+32 -33
django/contrib/localflavor/nl/forms.py
+5 -5
django/contrib/localflavor/no/forms.py
+3 -3
django/contrib/localflavor/no/no_municipalities.py
+21 -22
django/contrib/localflavor/pe/forms.py
+3 -3
django/contrib/localflavor/pe/pe_region.py
+25 -26
django/contrib/localflavor/pl/forms.py
+18 -18
django/contrib/localflavor/pl/pl_administrativeunits.py
+376 -377
django/contrib/localflavor/pt/forms.py
+3 -5
django/contrib/localflavor/py/py_department.py
+36 -37
django/contrib/localflavor/ro/forms.py
+7 -7
django/contrib/localflavor/ro/ro_counties.py
+42 -43
django/contrib/localflavor/ru/forms.py
+4 -4
django/contrib/localflavor/se/forms.py
+3 -3
django/contrib/localflavor/se/se_counties.py
+21 -22
django/contrib/localflavor/si/forms.py
+9 -9
django/contrib/localflavor/si/si_postalcodes.py
+463 -464
django/contrib/localflavor/sk/forms.py
+2 -2
django/contrib/localflavor/tr/forms.py
+9 -9
django/contrib/localflavor/us/forms.py
+6 -6
django/contrib/localflavor/uy/forms.py
+2 -2
django/contrib/localflavor/uy/uy_departaments.py
+19 -20
django/contrib/localflavor/za/forms.py
+3 -4
django/contrib/messages/storage/base.py
+1 -3
django/contrib/sitemaps/tests/flatpages.py
+4 -6
django/contrib/sitemaps/tests/http.py
+1 -3
django/contrib/sites/tests.py
+3 -5
django/contrib/staticfiles/management/commands/collectstatic.py
+14 -16
django/contrib/staticfiles/management/commands/findstatic.py
+3 -5
django/contrib/staticfiles/storage.py
+5 -6
django/contrib/syndication/views.py
+1 -3
django/contrib/webdesign/lorem_ipsum.py
+5 -7
django/contrib/webdesign/templatetags/webdesign.py
+1 -3
django/contrib/webdesign/tests.py
+2 -3
django/core/context_processors.py
+1 -2
django/core/files/base.py
+1 -3
django/core/files/uploadhandler.py
+2 -4
django/core/handlers/base.py
+3 -5
django/core/handlers/wsgi.py
+5 -7
django/core/mail/__init__.py
+2 -3
django/core/mail/message.py
+3 -5
django/core/management/commands/createcachetable.py
+1 -3
django/core/management/commands/loaddata.py
+1 -4
django/core/management/commands/sql.py
+1 -3
django/core/management/commands/sqlall.py
+1 -3
django/core/management/commands/sqlclear.py
+1 -3
django/core/management/commands/sqlcustom.py
+1 -3
django/core/management/commands/sqlflush.py
+1 -3
django/core/management/commands/sqlindexes.py
+1 -3
django/core/management/commands/sqlsequencereset.py
+1 -3
django/core/management/sql.py
+2 -4
django/core/management/validation.py
+1 -2
django/core/serializers/json.py
+1 -4
django/core/serializers/python.py
+1 -2
django/core/serializers/xml_serializer.py
+1 -3
django/core/urlresolvers.py
+4 -5
django/core/validators.py
+15 -17
django/db/backends/mysql/base.py
+2 -3
django/db/backends/oracle/base.py
+5 -5
django/db/backends/postgresql_psycopg2/introspection.py
+1 -3
django/db/backends/postgresql_psycopg2/operations.py
+6 -8
django/db/backends/sqlite3/base.py
+3 -4
django/db/backends/util.py
+2 -4
django/db/models/base.py
+3 -5
django/db/models/fields/__init__.py
+29 -31
django/db/models/fields/files.py
+1 -1
django/forms/extras/widgets.py
+1 -2
django/forms/fields.py
+36 -36
django/forms/forms.py
+18 -18
django/forms/formsets.py
+11 -11
django/forms/models.py
+10 -10
django/forms/util.py
+10 -12
django/forms/widgets.py
+45 -45
django/http/__init__.py
+3 -5
django/http/multipartparser.py
+4 -10
django/template/base.py
+4 -4
django/template/defaultfilters.py
+40 -41
django/template/defaulttags.py
+7 -8
django/templatetags/cache.py
+2 -4
django/templatetags/i18n.py
+4 -5
django/test/client.py
+1 -1
django/test/html.py
+8 -11
django/test/testcases.py
+27 -25
django/test/utils.py
-2
django/utils/crypto.py
+2 -4
django/utils/dateformat.py
+18 -19
django/utils/encoding.py
+2 -4
django/utils/feedgenerator.py
+80 -81
django/utils/html.py
+20 -22
django/utils/regex_helper.py
+16 -17
django/utils/text.py
+22 -24
django/utils/timesince.py
+1 -3
django/utils/translation/__init__.py
+1 -3
django/utils/translation/trans_real.py
+20 -23
django/utils/tzinfo.py
+1 -3
django/utils/version.py
-2
django/views/debug.py
+2 -4
django/views/generic/base.py
+3 -5
django/views/generic/dates.py
+9 -11
django/views/generic/detail.py
+6 -8
django/views/generic/list.py
+4 -6
django/views/static.py
+3 -4
docs/conf.py
+6 -8
docs/ref/files/file.txt
+1 -2
docs/ref/forms/fields.txt
+2
docs/ref/forms/validation.txt
+2 -2
docs/ref/unicode.txt
+9 -35
docs/topics/db/models.txt
+8 -8
docs/topics/i18n/translation.txt
+2 -2
tests/modeltests/aggregation/tests.py
+50 -50
tests/modeltests/basic/tests.py
+7 -7
tests/modeltests/custom_columns/models.py
+1 -3
tests/modeltests/custom_managers/models.py
+1 -3
tests/modeltests/custom_pk/models.py
+2 -2
tests/modeltests/custom_pk/tests.py
+2 -2
tests/modeltests/distinct_on_fields/models.py
+1 -3
tests/modeltests/distinct_on_fields/tests.py
+1 -3
tests/modeltests/expressions/models.py
+1 -2
tests/modeltests/expressions/tests.py
+10 -10
tests/modeltests/field_subclassing/fields.py
+1 -3
tests/modeltests/files/tests.py
+13 -13
tests/modeltests/fixtures_model_package/tests.py
+12 -14
tests/modeltests/generic_relations/models.py
+1 -3
tests/modeltests/generic_relations/tests.py
+26 -26
tests/modeltests/get_or_create/models.py
+1 -3
tests/modeltests/invalid_models/invalid_models/models.py
+3 -5
tests/modeltests/lookup/models.py
+2 -4
tests/modeltests/lookup/tests.py
+22 -22
tests/modeltests/m2m_and_m2o/models.py
+1 -2
tests/modeltests/m2m_intermediary/models.py
+2 -3
tests/modeltests/m2m_through/tests.py
+1 -1
tests/modeltests/many_to_one/models.py
+1 -2
tests/modeltests/many_to_one/tests.py
+3 -3
tests/modeltests/model_forms/models.py
+1 -2
tests/modeltests/model_forms/tests.py
+113 -113
tests/modeltests/model_formsets/models.py
+4 -6
tests/modeltests/model_formsets/tests.py
+41 -41
tests/modeltests/model_inheritance/models.py
+7 -8
tests/modeltests/one_to_one/models.py
+4 -5
tests/modeltests/pagination/tests.py
+4 -4
tests/modeltests/prefetch_related/tests.py
+19 -19
tests/modeltests/proxy_models/tests.py
+3 -3
tests/modeltests/save_delete_hooks/models.py
+1 -2
tests/modeltests/select_related/tests.py
+3 -3
tests/modeltests/serializers/models.py
+2 -3
tests/modeltests/serializers/tests.py
+3 -3
tests/modeltests/signals/models.py
+2 -3
tests/modeltests/str/tests.py
+2 -2
tests/modeltests/test_client/models.py
+3 -3
tests/modeltests/timezones/tests.py
+15 -17
tests/modeltests/transactions/models.py
+1 -2
tests/modeltests/update/tests.py
+5 -5
tests/modeltests/validation/models.py
+3 -5
tests/modeltests/validation/test_error_messages.py
+34 -36
tests/modeltests/validation/test_unique.py
+7 -7
tests/modeltests/validation/tests.py
+2 -2
tests/modeltests/validation/validators.py
+2 -2
tests/modeltests/validators/tests.py
+6 -9
tests/regressiontests/admin_custom_urls/tests.py
+4 -4
tests/regressiontests/admin_filters/models.py
+2 -4
tests/regressiontests/admin_filters/tests.py
+46 -46
tests/regressiontests/admin_inlines/models.py
+2 -4
tests/regressiontests/admin_inlines/tests.py
+5 -5
tests/regressiontests/admin_ordering/tests.py
+7 -7
tests/regressiontests/admin_util/tests.py
+2 -2
tests/regressiontests/admin_views/admin.py
+3 -3
tests/regressiontests/admin_views/models.py
+19 -21
tests/regressiontests/admin_views/tests.py
+134 -133
tests/regressiontests/admin_widgets/models.py
+1 -3
tests/regressiontests/admin_widgets/tests.py
+6 -6
tests/regressiontests/aggregation_regress/tests.py
+42 -42
tests/regressiontests/backends/models.py
+2 -4
tests/regressiontests/backends/tests.py
+4 -4
tests/regressiontests/cache/tests.py
+11 -11
tests/regressiontests/comment_tests/tests/comment_view_tests.py
+3 -3
tests/regressiontests/csrf_tests/tests.py
+4 -5
tests/regressiontests/custom_columns_regress/models.py
+1 -2
tests/regressiontests/datatypes/tests.py
+3 -3
tests/regressiontests/defaultfilters/tests.py
+324 -325
tests/regressiontests/expressions_regress/models.py
+1 -2
tests/regressiontests/extra_regress/models.py
+2 -4
tests/regressiontests/extra_regress/tests.py
+18 -18
tests/regressiontests/file_storage/tests.py
+4 -4
tests/regressiontests/file_uploads/tests.py
+12 -11
tests/regressiontests/file_uploads/views.py
+2 -2
tests/regressiontests/fixtures_regress/models.py
+5 -5
tests/regressiontests/fixtures_regress/tests.py
+2 -2
tests/regressiontests/forms/models.py
+2 -4
tests/regressiontests/forms/tests/error_messages.py
+59 -58
tests/regressiontests/forms/{tests => }/extra.py
+88 -87
tests/regressiontests/forms/tests/fields.py
+283 -285
tests/regressiontests/forms/tests/forms.py
+127 -130
tests/regressiontests/forms/tests/formsets.py
+43 -45
tests/regressiontests/forms/tests/models.py
+9 -9
tests/regressiontests/forms/tests/regressions.py
+14 -20
tests/regressiontests/forms/tests/util.py
+7 -9
tests/regressiontests/forms/tests/widgets.py
+162 -163
tests/regressiontests/generic_inline_admin/tests.py
+21 -20
tests/regressiontests/httpwrappers/tests.py
+28 -30
tests/regressiontests/i18n/contenttypes/tests.py
+2 -3
tests/regressiontests/i18n/patterns/tests.py
+4 -6
tests/regressiontests/i18n/tests.py
+148 -148
tests/regressiontests/inline_formsets/tests.py
+23 -23
tests/regressiontests/introspection/models.py
+1 -3
tests/regressiontests/introspection/tests.py
+3 -3
tests/regressiontests/localflavor/ar/tests.py
+13 -15
tests/regressiontests/localflavor/at/tests.py
+3 -5
tests/regressiontests/localflavor/au/tests.py
+7 -7
tests/regressiontests/localflavor/be/tests.py
+16 -18
tests/regressiontests/localflavor/br/tests.py
+18 -20
tests/regressiontests/localflavor/ca/tests.py
+5 -7
tests/regressiontests/localflavor/ch/tests.py
+4 -6
tests/regressiontests/localflavor/cl/tests.py
+3 -5
tests/regressiontests/localflavor/cn/tests.py
+18 -19
tests/regressiontests/localflavor/co/tests.py
+1 -3
tests/regressiontests/localflavor/cz/tests.py
+5 -7
tests/regressiontests/localflavor/de/tests.py
+3 -5
tests/regressiontests/localflavor/ec/tests.py
+1 -3
tests/regressiontests/localflavor/es/tests.py
+10 -12
tests/regressiontests/localflavor/fi/tests.py
+3 -5
tests/regressiontests/localflavor/fr/tests.py
+3 -5
tests/regressiontests/localflavor/gb/tests.py
+2 -4
tests/regressiontests/localflavor/generic/tests.py
+2 -4
tests/regressiontests/localflavor/hr/tests.py
+18 -20
tests/regressiontests/localflavor/id/tests.py
+24 -26
tests/regressiontests/localflavor/ie/tests.py
+1 -3
tests/regressiontests/localflavor/il/tests.py
+2 -4
tests/regressiontests/localflavor/in_/tests.py
+4 -6
tests/regressiontests/localflavor/is_/tests.py
+8 -10
tests/regressiontests/localflavor/it/tests.py
+4 -6
tests/regressiontests/localflavor/jp/tests.py
+2 -4
tests/regressiontests/localflavor/kw/tests.py
+1 -3
tests/regressiontests/localflavor/mk/tests.py
+12 -12
tests/regressiontests/localflavor/mx/tests.py
+33 -33
tests/regressiontests/localflavor/nl/tests.py
+4 -6
tests/regressiontests/localflavor/pl/tests.py
+12 -14
tests/regressiontests/localflavor/pt/tests.py
+2 -4
tests/regressiontests/localflavor/py/tests.py
+2 -4
tests/regressiontests/localflavor/ro/tests.py
+20 -22
tests/regressiontests/localflavor/ru/tests.py
+5 -7
tests/regressiontests/localflavor/se/tests.py
+5 -7
tests/regressiontests/localflavor/si/tests.py
+8 -9
tests/regressiontests/localflavor/sk/tests.py
+3 -5
tests/regressiontests/localflavor/us/tests.py
+7 -7
tests/regressiontests/localflavor/uy/tests.py
+6 -8
tests/regressiontests/localflavor/za/tests.py
+2 -4
tests/regressiontests/logging_tests/tests.py
+2 -4
tests/regressiontests/m2m_through_regress/models.py
+1 -3
tests/regressiontests/mail/tests.py
+7 -9
tests/regressiontests/many_to_one_regress/models.py
+1 -2
tests/regressiontests/model_fields/tests.py
+5 -5
tests/regressiontests/model_forms_regress/models.py
+1 -3
tests/regressiontests/model_forms_regress/tests.py
+10 -10
tests/regressiontests/model_formsets_regress/tests.py
+57 -57
tests/regressiontests/model_inheritance_regress/models.py
+5 -7
tests/regressiontests/model_inheritance_regress/tests.py
+10 -9
tests/regressiontests/model_inheritance_select_related/models.py
+2 -3
tests/regressiontests/model_regress/tests.py
+2 -2
tests/regressiontests/modeladmin/tests.py
+8 -8
tests/regressiontests/multiple_database/tests.py
+54 -54
tests/regressiontests/null_fk/tests.py
+5 -5
tests/regressiontests/null_fk_ordering/models.py
+1 -2
tests/regressiontests/null_queries/models.py
+2 -4
tests/regressiontests/one_to_one_regress/models.py
+4 -6
tests/regressiontests/pagination_regress/tests.py
+2 -4
tests/regressiontests/queries/models.py
+2 -3
tests/regressiontests/queries/tests.py
+10 -11
tests/regressiontests/requests/tests.py
+45 -48
tests/regressiontests/select_related_regress/models.py
+4 -6
tests/regressiontests/select_related_regress/tests.py
+13 -13
tests/regressiontests/serializers_regress/tests.py
+2 -2
tests/regressiontests/signed_cookies_tests/tests.py
+3 -5
tests/regressiontests/signing/tests.py
+4 -6
tests/regressiontests/staticfiles_tests/tests.py
+5 -6
tests/regressiontests/string_lookup/tests.py
+3 -3
tests/regressiontests/syndication/feeds.py
+5 -5
tests/regressiontests/syndication/tests.py
+2 -2
tests/regressiontests/templates/callables.py
+8 -10
tests/regressiontests/templates/custom.py
+63 -63
tests/regressiontests/templates/filters.py
+67 -69
tests/regressiontests/templates/parser.py
+15 -17
tests/regressiontests/templates/tests.py
+39 -39
tests/regressiontests/templates/unicode.py
+4 -6
tests/regressiontests/templates/urls.py
+3 -3
tests/regressiontests/test_client_regress/tests.py
+11 -13
tests/regressiontests/test_utils/tests.py
+5 -5
tests/regressiontests/text/tests.py
+43 -44
tests/regressiontests/utils/dateformat.py
+37 -39
tests/regressiontests/utils/feedgenerator.py
+2 -4
tests/regressiontests/utils/html.py
+9 -11
tests/regressiontests/utils/ipv6.py
+9 -11
tests/regressiontests/utils/jslex.py
+1 -1
tests/regressiontests/utils/regex_helper.py
+7 -9
tests/regressiontests/utils/simplelazyobject.py
+2 -6
tests/regressiontests/utils/text.py
+41 -43
tests/regressiontests/utils/timesince.py
+35 -37
tests/regressiontests/views/__init__.py
+4 -5
tests/regressiontests/views/generic_urls.py
+5 -5
tests/regressiontests/views/tests/specials.py
+1 -3
tests/regressiontests/wsgi/tests.py
+1 -3
expand_less