Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removed most of absolute_import imports

Should be unneeded with Python 2.7 and up.
Added some unicode_literals along the way.
  • Loading branch information...
commit 5c1143910e071c73671424036408c4548742d24f 1 parent 402b4a7
@claudep claudep authored
Showing with 194 additions and 366 deletions.
  1. +1 −1  django/contrib/admindocs/tests/test_fields.py
  2. +0 −2  django/contrib/comments/views/comments.py
  3. +0 −2  django/contrib/comments/views/moderation.py
  4. +0 −2  django/contrib/formtools/tests/urls.py
  5. +0 −2  django/contrib/gis/geoip/__init__.py
  6. +1 −1  django/contrib/gis/tests/distapp/tests.py
  7. +1 −1  django/contrib/gis/tests/geo3d/tests.py
  8. +1 −1  django/contrib/gis/tests/geoadmin/tests.py
  9. +1 −1  django/contrib/gis/tests/geoapp/feeds.py
  10. +0 −2  django/contrib/gis/tests/geoapp/sitemaps.py
  11. +1 −1  django/contrib/gis/tests/geoapp/test_feeds.py
  12. +1 −1  django/contrib/gis/tests/geoapp/test_regress.py
  13. +1 −1  django/contrib/gis/tests/geoapp/test_sitemaps.py
  14. +1 −1  django/contrib/gis/tests/geoapp/tests.py
  15. +1 −1  django/contrib/gis/tests/geoapp/urls.py
  16. +1 −1  django/contrib/gis/tests/geogapp/tests.py
  17. +1 −1  django/contrib/gis/tests/inspectapp/tests.py
  18. +1 −1  django/contrib/gis/tests/layermap/tests.py
  19. +1 −1  django/contrib/gis/tests/relatedapp/tests.py
  20. +0 −2  django/contrib/messages/__init__.py
  21. +1 −1  django/core/cache/utils.py
  22. +1 −1  django/core/management/utils.py
  23. +1 −0  django/core/serializers/json.py
  24. +0 −2  django/db/models/sql/__init__.py
  25. +0 −2  django/db/models/sql/where.py
  26. +0 −2  django/forms/__init__.py
  27. +0 −2  django/forms/extras/__init__.py
  28. +1 −1  django/forms/fields.py
  29. +1 −1  django/forms/forms.py
  30. +1 −1  django/forms/formsets.py
  31. +1 −1  django/forms/models.py
  32. +1 −1  django/forms/widgets.py
  33. +1 −1  django/http/cookie.py
  34. +1 −1  django/http/request.py
  35. +1 −1  django/http/response.py
  36. +1 −1  django/template/base.py
  37. +0 −2  tests/admin_changelist/admin.py
  38. +1 −1  tests/admin_changelist/tests.py
  39. +1 −1  tests/admin_custom_urls/tests.py
  40. +0 −3  tests/admin_docs/urls.py
  41. +1 −1  tests/admin_filters/tests.py
  42. +0 −2  tests/admin_inlines/admin.py
  43. +1 −1  tests/admin_inlines/tests.py
  44. +0 −2  tests/admin_inlines/urls.py
  45. +1 −1  tests/admin_ordering/tests.py
  46. +1 −1  tests/admin_registration/tests.py
  47. +0 −2  tests/admin_scripts/complex_app/admin/foo.py
  48. +0 −2  tests/admin_scripts/complex_app/models/bar.py
  49. +0 −2  tests/admin_scripts/simple_app/models.py
  50. +1 −1  tests/admin_util/tests.py
  51. +6 −3 tests/admin_validation/tests.py
  52. +1 −1  tests/admin_views/admin.py
  53. +1 −1  tests/admin_views/customadmin.py
  54. +1 −1  tests/admin_views/tests.py
  55. +0 −2  tests/admin_views/urls.py
  56. +1 −1  tests/admin_widgets/tests.py
  57. +0 −2  tests/admin_widgets/urls.py
  58. +1 −6 tests/admin_widgets/widgetadmin.py
  59. +1 −1  tests/aggregation/tests.py
  60. +1 −1  tests/aggregation_regress/tests.py
  61. +1 −1  tests/app_loading/tests.py
  62. +1 −1  tests/backends/tests.py
  63. +1 −1  tests/basic/tests.py
  64. +0 −2  tests/bug639/tests.py
  65. +0 −2  tests/bug8245/admin.py
  66. +1 −1  tests/bulk_create/tests.py
  67. +1 −1  tests/cache/tests.py
  68. +0 −2  tests/choices/tests.py
  69. +0 −2  tests/comment_tests/tests/__init__.py
  70. +0 −2  tests/comment_tests/tests/test_app_api.py
  71. +0 −2  tests/comment_tests/tests/test_comment_form.py
  72. +0 −2  tests/comment_tests/tests/test_comment_utils_moderators.py
  73. +1 −1  tests/comment_tests/tests/test_comment_view.py
  74. +0 −2  tests/comment_tests/tests/test_feeds.py
  75. +0 −2  tests/comment_tests/tests/test_models.py
  76. +1 −1  tests/comment_tests/tests/test_moderation_views.py
  77. +0 −2  tests/comment_tests/tests/test_templatetags.py
  78. +0 −2  tests/comment_tests/urls.py
  79. +0 −3  tests/conditional_processing/views.py
  80. +1 −1  tests/contenttypes_tests/models.py
  81. +1 −1  tests/contenttypes_tests/tests.py
  82. +1 −1  tests/contenttypes_tests/urls.py
  83. +0 −2  tests/context_processors/urls.py
  84. +1 −1  tests/custom_columns/tests.py
  85. +1 −1  tests/custom_columns_regress/tests.py
  86. +1 −1  tests/custom_managers/tests.py
  87. +1 −1  tests/custom_managers_regress/tests.py
  88. +1 −1  tests/custom_methods/tests.py
  89. +1 −1  tests/custom_pk/models.py
  90. +1 −1  tests/custom_pk/tests.py
  91. +1 −1  tests/datatypes/tests.py
  92. +1 −1  tests/dates/tests.py
  93. +1 −1  tests/datetimes/tests.py
  94. +1 −1  tests/defer/tests.py
  95. +1 −1  tests/defer_regress/tests.py
  96. +1 −1  tests/delete/tests.py
  97. +1 −1  tests/delete_regress/tests.py
  98. +0 −2  tests/dispatch/tests/__init__.py
  99. +1 −1  tests/distinct_on_fields/tests.py
  100. +0 −2  tests/empty/tests.py
  101. +1 −1  tests/expressions/tests.py
  102. +1 −1  tests/expressions_regress/tests.py
  103. +1 −1  tests/extra_regress/tests.py
  104. +0 −2  tests/field_defaults/tests.py
  105. +0 −2  tests/field_subclassing/models.py
  106. +1 −1  tests/field_subclassing/tests.py
  107. +1 −1  tests/file_storage/tests.py
  108. +1 −1  tests/file_uploads/tests.py
  109. +0 −2  tests/file_uploads/urls.py
  110. +1 −1  tests/file_uploads/views.py
  111. +1 −1  tests/files/tests.py
  112. +1 −1  tests/fixtures/tests.py
  113. +1 −1  tests/fixtures_regress/models.py
  114. +1 −1  tests/fixtures_regress/tests.py
  115. +1 −1  tests/force_insert_update/tests.py
  116. +0 −2  tests/forms_tests/tests/__init__.py
  117. +1 −1  tests/forms_tests/tests/test_error_messages.py
  118. +1 −1  tests/forms_tests/tests/test_extra.py
  119. +1 −1  tests/forms_tests/tests/tests.py
  120. +0 −2  tests/generic_inline_admin/admin.py
  121. +1 −1  tests/generic_inline_admin/tests.py
  122. +0 −2  tests/generic_inline_admin/urls.py
  123. +1 −1  tests/generic_relations/tests.py
  124. +1 −1  tests/generic_views/test_base.py
  125. +1 −1  tests/generic_views/test_dates.py
  126. +1 −1  tests/generic_views/test_detail.py
  127. +1 −1  tests/generic_views/test_edit.py
  128. +1 −1  tests/generic_views/test_forms.py
  129. +1 −1  tests/generic_views/test_list.py
  130. +0 −2  tests/generic_views/urls.py
  131. +1 −1  tests/generic_views/views.py
  132. +1 −1  tests/get_earliest_or_latest/tests.py
  133. +2 −2 tests/get_object_or_404/tests.py
  134. +2 −2 tests/get_or_create/tests.py
  135. +1 −1  tests/get_or_create_regress/tests.py
  136. +0 −2  tests/i18n/forms.py
  137. +1 −1  tests/i18n/tests.py
  138. +1 −1  tests/inline_formsets/tests.py
  139. +1 −1  tests/introspection/tests.py
  140. +1 −1  tests/known_related_objects/tests.py
  141. +1 −1  tests/lookup/tests.py
  142. +0 −2  tests/m2m_and_m2o/tests.py
  143. +1 −1  tests/m2m_intermediary/tests.py
  144. +1 −1  tests/m2m_multiple/tests.py
  145. +1 −1  tests/m2m_recursive/tests.py
  146. +1 −1  tests/m2m_regress/tests.py
  147. +0 −2  tests/m2m_signals/tests.py
  148. +1 −1  tests/m2m_through/tests.py
  149. +1 −1  tests/m2m_through_regress/tests.py
  150. +1 −1  tests/m2o_recursive/tests.py
  151. +1 −1  tests/managers_regress/tests.py
  152. +1 −1  tests/many_to_many/tests.py
  153. +0 −2  tests/many_to_one/tests.py
  154. +1 −1  tests/many_to_one_null/tests.py
  155. +1 −1  tests/many_to_one_regress/tests.py
  156. +1 −1  tests/max_lengths/tests.py
  157. +1 −1  tests/middleware/tests.py
  158. +0 −3  tests/middleware_exceptions/urls.py
  159. +1 −1  tests/model_fields/test_imagefield.py
  160. +1 −1  tests/model_fields/tests.py
  161. +1 −1  tests/model_forms/tests.py
  162. +1 −1  tests/model_forms_regress/tests.py
  163. +1 −1  tests/model_formsets/tests.py
  164. +1 −1  tests/model_formsets_regress/tests.py
  165. +1 −1  tests/model_inheritance/tests.py
  166. +1 −1  tests/model_inheritance_regress/tests.py
  167. +0 −2  tests/model_inheritance_same_model_name/models.py
  168. +1 −1  tests/model_inheritance_same_model_name/tests.py
  169. +1 −1  tests/model_inheritance_select_related/tests.py
  170. +0 −2  tests/model_package/models/__init__.py
  171. +1 −1  tests/model_package/tests.py
  172. +0 −2  tests/model_permalink/tests.py
  173. +1 −1  tests/model_regress/tests.py
  174. +1 −1  tests/modeladmin/tests.py
  175. +0 −2  tests/multiple_database/models.py
  176. +1 −1  tests/multiple_database/tests.py
  177. +0 −2  tests/mutually_referential/tests.py
  178. +2 −1  tests/nested_foreign_keys/tests.py
  179. +1 −1  tests/null_fk/tests.py
  180. +1 −1  tests/null_fk_ordering/tests.py
  181. +1 −1  tests/null_queries/tests.py
  182. +1 −1  tests/one_to_one/tests.py
  183. +1 −1  tests/one_to_one_regress/tests.py
  184. +1 −1  tests/or_lookups/tests.py
  185. +1 −1  tests/order_with_respect_to/tests.py
  186. +1 −1  tests/ordering/tests.py
  187. +1 −1  tests/pagination/tests.py
  188. +1 −1  tests/prefetch_related/tests.py
  189. +1 −1  tests/properties/tests.py
  190. +0 −2  tests/proxy_model_inheritance/app1/models.py
  191. +1 −1  tests/proxy_model_inheritance/tests.py
  192. +1 −1  tests/proxy_models/tests.py
  193. +1 −1  tests/queries/tests.py
  194. +0 −2  tests/queryset_pickle/models.py
  195. +2 −2 tests/queryset_pickle/tests.py
  196. +1 −1  tests/raw_query/tests.py
  197. +1 −1  tests/reserved_names/tests.py
  198. +1 −1  tests/reverse_lookup/tests.py
  199. +0 −2  tests/reverse_single_related/tests.py
  200. +1 −1  tests/save_delete_hooks/tests.py
  201. +1 −1  tests/select_for_update/tests.py
  202. +1 −1  tests/select_related/tests.py
  203. +1 −1  tests/select_related_onetoone/tests.py
  204. +1 −1  tests/select_related_regress/tests.py
  205. +2 −2 tests/serializers/tests.py
  206. +1 −1  tests/serializers_regress/tests.py
  207. +0 −2  tests/servers/urls.py
  208. +1 −1  tests/signals/tests.py
  209. +1 −1  tests/signals_regress/tests.py
  210. +0 −2  tests/sites_framework/tests.py
  211. +1 −1  tests/str/tests.py
  212. +2 −2 tests/string_lookup/tests.py
  213. +1 −1  tests/swappable_models/tests.py
  214. +1 −1  tests/syndication/feeds.py
  215. +1 −1  tests/syndication/tests.py
  216. +0 −2  tests/syndication/urls.py
  217. +1 −1  tests/tablespaces/tests.py
  218. +0 −4 tests/template_tests/alternate_urls.py
  219. +1 −1  tests/template_tests/test_custom.py
  220. +1 −1  tests/template_tests/tests.py
  221. +1 −1  tests/template_tests/urls.py
  222. +1 −1  tests/test_client/tests.py
  223. +0 −2  tests/test_client/urls.py
  224. +0 −2  tests/test_client_regress/urls.py
  225. +1 −1  tests/test_runner/tests.py
  226. +1 −1  tests/test_utils/tests.py
  227. +0 −2  tests/test_utils/urls.py
  228. +1 −3 tests/test_utils/views.py
  229. +0 −2  tests/timezones/admin.py
  230. +0 −2  tests/timezones/urls.py
  231. +1 −1  tests/transactions/tests.py
  232. +1 −1  tests/transactions_regress/tests.py
  233. +1 −1  tests/unmanaged_models/tests.py
  234. +1 −1  tests/update/tests.py
  235. +1 −1  tests/update_only_fields/tests.py
  236. +0 −2  tests/urlpatterns_reverse/extra_urls.py
  237. +0 −2  tests/urlpatterns_reverse/included_named_urls.py
  238. +0 −2  tests/urlpatterns_reverse/included_named_urls2.py
  239. +0 −2  tests/urlpatterns_reverse/included_namespace_urls.py
  240. +0 −2  tests/urlpatterns_reverse/included_urls.py
  241. +0 −2  tests/urlpatterns_reverse/included_urls2.py
  242. +0 −2  tests/urlpatterns_reverse/middleware.py
  243. +0 −2  tests/urlpatterns_reverse/named_urls.py
  244. +0 −2  tests/urlpatterns_reverse/namespace_urls.py
  245. +0 −2  tests/urlpatterns_reverse/reverse_lazy_urls.py
  246. +1 −1  tests/urlpatterns_reverse/tests.py
  247. +1 −3 tests/urlpatterns_reverse/urlconf_outer.py
  248. +0 −2  tests/urlpatterns_reverse/urls.py
  249. +0 −2  tests/urlpatterns_reverse/urls_error_handlers_callables.py
  250. +0 −2  tests/urlpatterns_reverse/urls_without_full_import.py
  251. +1 −2  tests/utils_tests/test_safestring.py
  252. +0 −2  tests/validation/test_custom_messages.py
  253. +1 −1  tests/validation/test_unique.py
  254. +1 −1  tests/validation/test_validators.py
  255. +1 −1  tests/validation/tests.py
  256. +1 −1  tests/view_tests/generic_urls.py
  257. +0 −2  tests/view_tests/templatetags/debugtags.py
  258. +0 −2  tests/view_tests/tests/__init__.py
  259. +1 −1  tests/view_tests/tests/test_debug.py
  260. +1 −1  tests/view_tests/tests/test_defaults.py
  261. +0 −2  tests/view_tests/tests/test_i18n.py
  262. +1 −1  tests/view_tests/tests/test_static.py
  263. +0 −2  tests/view_tests/urls.py
  264. +1 −1  tests/view_tests/views.py
View
2  django/contrib/admindocs/tests/test_fields.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import unittest
View
2  django/contrib/comments/views/comments.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django import http
from django.conf import settings
from django.contrib import comments
View
2  django/contrib/comments/views/moderation.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django import template
from django.conf import settings
from django.contrib import comments
View
2  django/contrib/formtools/tests/urls.py
@@ -2,8 +2,6 @@
This is a URLconf to be loaded by tests.py. Add any URLs needed for tests only.
"""
-from __future__ import absolute_import
-
from django.conf.urls import patterns, url
from django.contrib.formtools.tests.tests import TestFormPreview
View
2  django/contrib/gis/geoip/__init__.py
@@ -11,8 +11,6 @@
Grab GeoIP.dat.gz and GeoLiteCity.dat.gz, and unzip them in the directory
corresponding to settings.GEOIP_PATH.
"""
-from __future__ import absolute_import
-
try:
from .base import GeoIP, GeoIPException
HAS_GEOIP = True
View
2  django/contrib/gis/tests/distapp/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from unittest import skipUnless
View
2  django/contrib/gis/tests/geo3d/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import os
import re
View
2  django/contrib/gis/tests/geoadmin/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from unittest import skipUnless
View
2  django/contrib/gis/tests/geoapp/feeds.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.contrib.gis import feeds
View
2  django/contrib/gis/tests/geoapp/sitemaps.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.contrib.gis.sitemaps import GeoRSSSitemap, KMLSitemap, KMZSitemap
from .feeds import feed_dict
View
2  django/contrib/gis/tests/geoapp/test_feeds.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from unittest import skipUnless
from xml.dom import minidom
View
2  django/contrib/gis/tests/geoapp/test_regress.py
@@ -1,5 +1,5 @@
# -*- encoding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from datetime import datetime
from unittest import skipUnless
View
2  django/contrib/gis/tests/geoapp/test_sitemaps.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from io import BytesIO
from unittest import skipUnless
View
2  django/contrib/gis/tests/geoapp/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import re
import unittest
View
2  django/contrib/gis/tests/geoapp/urls.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.conf.urls import patterns
View
2  django/contrib/gis/tests/geogapp/tests.py
@@ -1,7 +1,7 @@
"""
Tests for geography support in PostGIS 1.5+
"""
-from __future__ import absolute_import
+from __future__ import unicode_literals
import os
from unittest import skipUnless
View
2  django/contrib/gis/tests/inspectapp/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import os
from unittest import skipUnless
View
2  django/contrib/gis/tests/layermap/tests.py
@@ -1,5 +1,5 @@
# coding: utf-8
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from copy import copy
from decimal import Decimal
View
2  django/contrib/gis/tests/relatedapp/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from unittest import skipUnless
View
2  django/contrib/messages/__init__.py
@@ -1,4 +1,2 @@
-from __future__ import absolute_import
-
from django.contrib.messages.api import *
from django.contrib.messages.constants import *
View
2  django/core/cache/utils.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import hashlib
from django.utils.encoding import force_bytes
View
2  django/core/management/utils.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import os
from subprocess import PIPE, Popen
View
1  django/core/serializers/json.py
@@ -4,6 +4,7 @@
# Avoid shadowing the standard library json module
from __future__ import absolute_import
+from __future__ import unicode_literals
import datetime
import decimal
View
2  django/db/models/sql/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.db.models.sql.datastructures import EmptyResultSet
from django.db.models.sql.subqueries import *
from django.db.models.sql.query import *
View
2  django/db/models/sql/where.py
@@ -2,8 +2,6 @@
Code to manage the creation and SQL rendering of 'where' constraints.
"""
-from __future__ import absolute_import
-
import collections
import datetime
from itertools import repeat
View
2  django/forms/__init__.py
@@ -2,8 +2,6 @@
Django validation and HTML form handling.
"""
-from __future__ import absolute_import
-
from django.core.exceptions import ValidationError
from django.forms.fields import *
from django.forms.forms import *
View
2  django/forms/extras/__init__.py
@@ -1,3 +1 @@
-from __future__ import absolute_import
-
from django.forms.extras.widgets import *
View
2  django/forms/fields.py
@@ -2,7 +2,7 @@
Field classes.
"""
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import copy
import datetime
View
2  django/forms/forms.py
@@ -2,7 +2,7 @@
Form classes
"""
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import copy
import warnings
View
2  django/forms/formsets.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.core.exceptions import ValidationError
from django.forms import Form
View
2  django/forms/models.py
@@ -3,7 +3,7 @@
and database field objects.
"""
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import warnings
View
2  django/forms/widgets.py
@@ -2,7 +2,7 @@
HTML Widget classes
"""
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import copy
from itertools import chain
View
2  django/http/cookie.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.utils.encoding import force_str
from django.utils import six
View
2  django/http/request.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import copy
import os
View
2  django/http/response.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
import time
View
2  django/template/base.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import re
from functools import partial
View
2  tests/admin_changelist/admin.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.contrib import admin
from django.core.paginator import Paginator
View
2  tests/admin_changelist/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
View
2  tests/admin_custom_urls/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import warnings
from django.contrib.admin.util import quote
View
3  tests/admin_docs/urls.py
@@ -1,6 +1,3 @@
-# coding: utf-8
-from __future__ import absolute_import
-
from django.conf.urls import patterns
from . import views
View
2  tests/admin_filters/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
View
2  tests/admin_inlines/admin.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.contrib import admin
from django import forms
View
2  tests/admin_inlines/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.contrib.admin.tests import AdminSeleniumWebDriverTestCase
from django.contrib.admin.helpers import InlineAdminForm
View
2  tests/admin_inlines/urls.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.conf.urls import patterns, include
from . import admin
View
2  tests/admin_ordering/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.test import TestCase, RequestFactory
from django.contrib import admin
View
2  tests/admin_registration/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.contrib import admin
from django.core.exceptions import ImproperlyConfigured
View
2  tests/admin_scripts/complex_app/admin/foo.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.contrib import admin
from ..models.foo import Foo
View
2  tests/admin_scripts/complex_app/models/bar.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.db import models
from ..admin import foo
View
2  tests/admin_scripts/simple_app/models.py
@@ -1,3 +1 @@
-from __future__ import absolute_import
-
from ..complex_app.models.bar import Bar
View
2  tests/admin_util/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from datetime import datetime
View
9 tests/admin_validation/tests.py
@@ -1,9 +1,10 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django import forms
from django.contrib import admin
from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase
+from django.test.utils import str_prefix
from .models import Song, Book, Album, TwoAlbumFKAndAnE, State, City
@@ -185,7 +186,8 @@ class SongAdmin(admin.ModelAdmin):
readonly_fields = ("title", "nonexistant")
self.assertRaisesMessage(ImproperlyConfigured,
- "SongAdmin.readonly_fields[1], 'nonexistant' is not a callable or an attribute of 'SongAdmin' or found in the model 'Song'.",
+ str_prefix("SongAdmin.readonly_fields[1], %(_)s'nonexistant' is not a callable "
+ "or an attribute of 'SongAdmin' or found in the model 'Song'."),
SongAdmin.validate,
Song)
@@ -195,7 +197,8 @@ class CityInline(admin.TabularInline):
readonly_fields=['i_dont_exist'] # Missing attribute
self.assertRaisesMessage(ImproperlyConfigured,
- "CityInline.readonly_fields[0], 'i_dont_exist' is not a callable or an attribute of 'CityInline' or found in the model 'City'.",
+ str_prefix("CityInline.readonly_fields[0], %(_)s'i_dont_exist' is not a callable "
+ "or an attribute of 'CityInline' or found in the model 'City'."),
CityInline.validate,
City)
View
2  tests/admin_views/admin.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import tempfile
import os
View
2  tests/admin_views/customadmin.py
@@ -1,7 +1,7 @@
"""
A second, custom AdminSite -- see tests.CustomAdminSiteTests.
"""
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.conf.urls import patterns
from django.contrib import admin
View
2  tests/admin_views/tests.py
@@ -1,5 +1,5 @@
# coding: utf-8
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import os
import re
View
2  tests/admin_views/urls.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.conf.urls import patterns, include
from . import views, customadmin, admin
View
2  tests/admin_widgets/tests.py
@@ -1,5 +1,5 @@
# encoding: utf-8
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from datetime import datetime, timedelta
from unittest import TestCase
View
2  tests/admin_widgets/urls.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.conf.urls import patterns, include
from . import widgetadmin
View
7 tests/admin_widgets/widgetadmin.py
@@ -1,8 +1,3 @@
-"""
-
-"""
-from __future__ import absolute_import
-
from django.contrib import admin
from . import models
@@ -47,4 +42,4 @@ class SchoolAdmin(admin.ModelAdmin):
site.register(models.Advisor)
-site.register(models.School, SchoolAdmin)
+site.register(models.School, SchoolAdmin)
View
2  tests/aggregation/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import datetime
from decimal import Decimal
View
2  tests/aggregation_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
import pickle
View
2  tests/app_loading/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import copy
import os
View
2  tests/backends/tests.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Unit and doctests for specific database backends.
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
from decimal import Decimal
View
2  tests/basic/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from datetime import datetime
import threading
View
2  tests/bug639/tests.py
@@ -4,8 +4,6 @@
ModelForm's save() method causes Model.save() to be called more than once.
"""
-from __future__ import absolute_import
-
import os
import shutil
import unittest
View
2  tests/bug8245/admin.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.contrib import admin
from .models import Story
View
2  tests/bulk_create/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from operator import attrgetter
View
2  tests/cache/tests.py
@@ -2,7 +2,7 @@
# Unit tests for cache framework
# Uses whatever cache backend is set in the test settings file.
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import hashlib
import os
View
2  tests/choices/tests.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.test import TestCase
from .models import Person
View
2  tests/comment_tests/tests/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.contrib.auth.models import User
from django.contrib.comments.forms import CommentForm
from django.contrib.comments.models import Comment
View
2  tests/comment_tests/tests/test_app_api.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.conf import settings
from django.contrib import comments
from django.contrib.comments.models import Comment
View
2  tests/comment_tests/tests/test_comment_form.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
import time
from django.conf import settings
View
2  tests/comment_tests/tests/test_comment_utils_moderators.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.contrib.comments.models import Comment
from django.contrib.comments.moderation import (moderator, CommentModerator,
AlreadyModerated)
View
2  tests/comment_tests/tests/test_comment_view.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import re
View
2  tests/comment_tests/tests/test_feeds.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from xml.etree import ElementTree as ET
from django.conf import settings
View
2  tests/comment_tests/tests/test_models.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.contrib.comments.models import Comment
from . import CommentTestCase
View
2  tests/comment_tests/tests/test_moderation_views.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.contrib.auth.models import User, Permission
from django.contrib.comments import signals
View
2  tests/comment_tests/tests/test_templatetags.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.contrib.comments.forms import CommentForm
from django.contrib.comments.models import Comment
from django.contrib.contenttypes.models import ContentType
View
2  tests/comment_tests/urls.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.conf.urls import patterns, url
from django.contrib.comments.feeds import LatestCommentFeed
View
3  tests/conditional_processing/views.py
@@ -1,6 +1,3 @@
-# -*- coding:utf-8 -*-
-from __future__ import absolute_import
-
from django.views.decorators.http import condition, etag, last_modified
from django.http import HttpResponse
View
2  tests/contenttypes_tests/models.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.db import models
from django.utils.encoding import python_2_unicode_compatible
View
2  tests/contenttypes_tests/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
View
2  tests/contenttypes_tests/urls.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.conf.urls import patterns
View
2  tests/context_processors/urls.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.conf.urls import patterns, url
from . import views
View
2  tests/custom_columns/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.core.exceptions import FieldError
from django.test import TestCase
View
2  tests/custom_columns_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.core.exceptions import FieldError
from django.test import TestCase
View
2  tests/custom_managers/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.test import TestCase
from django.utils import six
View
2  tests/custom_managers_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.test import TestCase
View
2  tests/custom_methods/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from datetime import date
View
2  tests/custom_pk/models.py
@@ -6,7 +6,7 @@
this behavior by explicitly adding ``primary_key=True`` to a field.
"""
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.db import models
View
2  tests/custom_pk/tests.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.db import transaction, IntegrityError
from django.test import TestCase, skipIfDBFeature
View
2  tests/datatypes/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
View
2  tests/dates/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import datetime
View
2  tests/datetimes/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import datetime
View
2  tests/defer/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.db.models.query_utils import DeferredAttribute, InvalidQuery
from django.test import TestCase
View
2  tests/defer_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from operator import attrgetter
View
2  tests/delete/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.db import models, IntegrityError, connection
from django.test import TestCase, skipUnlessDBFeature, skipIfDBFeature
View
2  tests/delete_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import datetime
View
2  tests/dispatch/tests/__init__.py
@@ -2,7 +2,5 @@
Unit-tests for the dispatch project
"""
-from __future__ import absolute_import
-
from .test_dispatcher import DispatcherTests, ReceiverTestCase
from .test_saferef import SaferefTests
View
2  tests/distinct_on_fields/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.db.models import Max
from django.test import TestCase, skipUnlessDBFeature
View
2  tests/empty/tests.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.core.exceptions import ImproperlyConfigured
from django.db.models.loading import get_app
from django.test import TestCase
View
2  tests/expressions/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.core.exceptions import FieldError
from django.db.models import F
View
2  tests/expressions_regress/tests.py
@@ -1,7 +1,7 @@
"""
Spanning tests for all the operations that F() expressions can perform.
"""
-from __future__ import absolute_import
+from __future__ import unicode_literals
import datetime
View
2  tests/extra_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
View
2  tests/field_defaults/tests.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from datetime import datetime
from django.test import TestCase
View
2  tests/field_subclassing/models.py
@@ -2,8 +2,6 @@
Tests for field subclassing.
"""
-from __future__ import absolute_import
-
from django.db import models
from django.utils.encoding import force_text
View
2  tests/field_subclassing/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.core import serializers
from django.test import TestCase
View
2  tests/file_storage/tests.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import errno
import os
View
2  tests/file_uploads/tests.py
@@ -1,5 +1,5 @@
#! -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import base64
import errno
View
2  tests/file_uploads/urls.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.conf.urls import patterns
from . import views
View
2  tests/file_uploads/views.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import hashlib
import json
View
2  tests/files/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import gzip
View
2  tests/fixtures/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import warnings
View
2  tests/fixtures_regress/models.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.contrib.auth.models import User
from django.db import models
View
2  tests/fixtures_regress/tests.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Unittests for fixtures.
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import os
import re
View
2  tests/force_insert_update/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.db import transaction, IntegrityError, DatabaseError
from django.test import TestCase
View
2  tests/forms_tests/tests/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from .test_error_messages import (FormsErrorMessagesTestCase,
ModelChoiceFieldErrorMessagesTestCase)
from .test_extra import FormsExtraTestCase, FormsExtraL10NTestCase
View
2  tests/forms_tests/tests/test_error_messages.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.core.files.uploadedfile import SimpleUploadedFile
from django.forms import *
View
2  tests/forms_tests/tests/test_extra.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
View
2  tests/forms_tests/tests/tests.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
View
2  tests/generic_inline_admin/admin.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.contrib import admin
from django.contrib.contenttypes import generic
View
2  tests/generic_inline_admin/tests.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.conf import settings
from django.contrib import admin
View
2  tests/generic_inline_admin/urls.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.conf.urls import patterns, include
from . import admin
View
2  tests/generic_relations/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django import forms
from django.contrib.contenttypes.generic import generic_inlineformset_factory
View
2  tests/generic_views/test_base.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import time
import unittest
View
2  tests/generic_views/test_dates.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import time
import datetime
View
2  tests/generic_views/test_detail.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase
View
2  tests/generic_views/test_edit.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import warnings
from unittest import expectedFailure
View
2  tests/generic_views/test_forms.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django import forms
View
2  tests/generic_views/test_list.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.core.exceptions import ImproperlyConfigured
from django.test import TestCase
View
2  tests/generic_views/urls.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.conf.urls import patterns, url
from django.views.decorators.cache import cache_page
from django.views.generic import TemplateView
View
2  tests/generic_views/views.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.contrib.auth.decorators import login_required
from django.core.paginator import Paginator
View
2  tests/get_earliest_or_latest/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from datetime import datetime
View
4 tests/get_object_or_404/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.http import Http404
from django.shortcuts import get_object_or_404, get_list_or_404
@@ -87,7 +87,7 @@ def test_bad_class(self):
self.assertRaisesMessage(ValueError,
"Object is of type 'str', but must be a Django Model, Manager, "
"or QuerySet",
- get_object_or_404, "Article", title__icontains="Run"
+ get_object_or_404, str("Article"), title__icontains="Run"
)
class CustomClass(object):
View
4 tests/get_or_create/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from datetime import date
import traceback
@@ -65,7 +65,7 @@ def test_get_or_create(self):
ManualPrimaryKeyTest.objects.get_or_create(id=1, data="Different")
except IntegrityError as e:
formatted_traceback = traceback.format_exc()
- self.assertIn('obj.save', formatted_traceback)
+ self.assertIn(str('obj.save'), formatted_traceback)
def test_savepoint_rollback(self):
# Regression test for #20463: the database connection should still be
View
2  tests/get_or_create_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.test import TestCase
View
2  tests/i18n/forms.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django import forms
from django.forms.extras import SelectDateWidget
View
2  tests/i18n/tests.py
@@ -1,5 +1,5 @@
# -*- encoding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
import decimal
View
2  tests/inline_formsets/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django.forms.models import inlineformset_factory
from django.test import TestCase
View
2  tests/introspection/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import unittest
View
2  tests/known_related_objects/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.test import TestCase
View
2  tests/lookup/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from datetime import datetime
from operator import attrgetter
View
2  tests/m2m_and_m2o/tests.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from django.db.models import Q
from django.test import TestCase
View
2  tests/m2m_intermediary/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from datetime import datetime
View
2  tests/m2m_multiple/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from datetime import datetime
View
2  tests/m2m_recursive/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from operator import attrgetter
View
2  tests/m2m_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.core.exceptions import FieldError
from django.test import TestCase
View
2  tests/m2m_signals/tests.py
@@ -2,8 +2,6 @@
Testing signals emitted on changing m2m relations.
"""
-from .models import Person
-
from django.db import models
from django.test import TestCase
View
2  tests/m2m_through/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from datetime import datetime
from operator import attrgetter
View
2  tests/m2m_through_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.core import management
from django.contrib.auth.models import User
View
2  tests/m2o_recursive/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.test import TestCase
View
2  tests/managers_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import copy
from django.conf import settings
View
2  tests/many_to_many/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.test import TestCase
from django.utils import six
View
2  tests/many_to_one/tests.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
from copy import deepcopy
import datetime
View
2  tests/many_to_one_null/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.test import TestCase
View
2  tests/many_to_one_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
from django.db import models
from django.test import TestCase
View
2  tests/max_lengths/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import unittest
View
2  tests/middleware/tests.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import gzip
from io import BytesIO
View
3  tests/middleware_exceptions/urls.py
@@ -1,6 +1,3 @@
-# coding: utf-8
-from __future__ import absolute_import
-
from django.conf.urls import patterns
from . import views
View
2  tests/model_fields/test_imagefield.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import unicode_literals
import os
import shutil
View
2  tests/model_fields/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
from decimal import Decimal
View
2  tests/model_forms/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
import os
View
2  tests/model_forms_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from datetime import date
import unittest
View
2  tests/model_formsets/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
import re
View
2  tests/model_formsets_regress/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from django import forms
from django.forms.formsets import BaseFormSet, DELETION_FIELD_NAME
View
2  tests/model_inheritance/tests.py
@@ -1,4 +1,4 @@
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
from operator import attrgetter
View
2  tests/model_inheritance_regress/tests.py
@@ -1,7 +1,7 @@
"""
Regression tests for Model inheritance behavior.
"""
-from __future__ import absolute_import, unicode_literals
+from __future__ import unicode_literals
import datetime
from operator import attrgetter
View
2  tests/model_inheritance_same_model_name/models.py