diff options
Diffstat (limited to 'tests/utils_tests')
21 files changed, 54 insertions, 42 deletions
diff --git a/tests/utils_tests/test_archive.py b/tests/utils_tests/test_archive.py index 6f1b66b14b..d1dc5f2841 100644 --- a/tests/utils_tests/test_archive.py +++ b/tests/utils_tests/test_archive.py @@ -3,9 +3,8 @@ import shutil import tempfile import unittest -from django.utils.archive import Archive, extract from django.utils._os import upath - +from django.utils.archive import Archive, extract TEST_DIR = os.path.join(os.path.dirname(upath(__file__)), 'archives') diff --git a/tests/utils_tests/test_autoreload.py b/tests/utils_tests/test_autoreload.py index bcb7d1a448..3b7135ee77 100644 --- a/tests/utils_tests/test_autoreload.py +++ b/tests/utils_tests/test_autoreload.py @@ -1,12 +1,12 @@ -from importlib import import_module import os import tempfile +from importlib import import_module from django import conf from django.contrib import admin from django.test import TestCase, override_settings -from django.utils.autoreload import gen_filenames from django.utils._os import upath +from django.utils.autoreload import gen_filenames LOCALE_PATH = os.path.join(os.path.dirname(__file__), 'locale') diff --git a/tests/utils_tests/test_baseconv.py b/tests/utils_tests/test_baseconv.py index 26ba126eb7..94c2d73b73 100644 --- a/tests/utils_tests/test_baseconv.py +++ b/tests/utils_tests/test_baseconv.py @@ -1,6 +1,8 @@ from unittest import TestCase -from django.utils.baseconv import base2, base16, base36, base56, base62, base64, BaseConverter +from django.utils.baseconv import ( + BaseConverter, base2, base16, base36, base56, base62, base64, +) from django.utils.six.moves import range diff --git a/tests/utils_tests/test_datastructures.py b/tests/utils_tests/test_datastructures.py index 04ae61902c..3c9d994947 100644 --- a/tests/utils_tests/test_datastructures.py +++ b/tests/utils_tests/test_datastructures.py @@ -6,10 +6,12 @@ import copy import pickle from django.test import SimpleTestCase, ignore_warnings -from django.utils.datastructures import (DictWrapper, ImmutableList, - MultiValueDict, MultiValueDictKeyError, MergeDict, OrderedSet, SortedDict) -from django.utils.deprecation import RemovedInDjango19Warning from django.utils import six +from django.utils.datastructures import ( + DictWrapper, ImmutableList, MergeDict, MultiValueDict, + MultiValueDictKeyError, OrderedSet, SortedDict, +) +from django.utils.deprecation import RemovedInDjango19Warning @ignore_warnings(category=RemovedInDjango19Warning) diff --git a/tests/utils_tests/test_dateformat.py b/tests/utils_tests/test_dateformat.py index c65f8beb1c..1edf01422d 100644 --- a/tests/utils_tests/test_dateformat.py +++ b/tests/utils_tests/test_dateformat.py @@ -1,13 +1,14 @@ from __future__ import unicode_literals -from datetime import datetime, date +from datetime import date, datetime from django.test import TestCase, override_settings from django.test.utils import TZ_SUPPORT, requires_tz_support +from django.utils import dateformat, translation from django.utils.dateformat import format -from django.utils import dateformat -from django.utils.timezone import utc, get_fixed_timezone, get_default_timezone, make_aware -from django.utils import translation +from django.utils.timezone import ( + get_default_timezone, get_fixed_timezone, make_aware, utc, +) @override_settings(TIME_ZONE='Europe/Copenhagen') diff --git a/tests/utils_tests/test_dateparse.py b/tests/utils_tests/test_dateparse.py index a224e3b174..7d4767feb7 100644 --- a/tests/utils_tests/test_dateparse.py +++ b/tests/utils_tests/test_dateparse.py @@ -1,9 +1,11 @@ from __future__ import unicode_literals -from datetime import date, time, datetime, timedelta import unittest +from datetime import date, datetime, time, timedelta -from django.utils.dateparse import parse_date, parse_time, parse_datetime, parse_duration +from django.utils.dateparse import ( + parse_date, parse_datetime, parse_duration, parse_time, +) from django.utils.timezone import get_fixed_timezone diff --git a/tests/utils_tests/test_datetime_safe.py b/tests/utils_tests/test_datetime_safe.py index 655a7350d5..dcb519b8fb 100644 --- a/tests/utils_tests/test_datetime_safe.py +++ b/tests/utils_tests/test_datetime_safe.py @@ -1,6 +1,9 @@ import unittest +from datetime import ( + date as original_date, datetime as original_datetime, + time as original_time, +) -from datetime import date as original_date, datetime as original_datetime, time as original_time from django.utils.datetime_safe import date, datetime, time diff --git a/tests/utils_tests/test_decorators.py b/tests/utils_tests/test_decorators.py index 8ef4737e54..16b861bf1a 100644 --- a/tests/utils_tests/test_decorators.py +++ b/tests/utils_tests/test_decorators.py @@ -1,7 +1,7 @@ from django.http import HttpResponse from django.template import engines from django.template.response import TemplateResponse -from django.test import TestCase, RequestFactory +from django.test import RequestFactory, TestCase from django.utils.decorators import decorator_from_middleware diff --git a/tests/utils_tests/test_encoding.py b/tests/utils_tests/test_encoding.py index 3119b6467a..e581003d9a 100644 --- a/tests/utils_tests/test_encoding.py +++ b/tests/utils_tests/test_encoding.py @@ -1,13 +1,13 @@ # -*- encoding: utf-8 -*- from __future__ import unicode_literals -import unittest import datetime +import unittest from django.utils import six from django.utils.encoding import ( - filepath_to_uri, force_bytes, force_text, escape_uri_path, - iri_to_uri, uri_to_iri, + escape_uri_path, filepath_to_uri, force_bytes, force_text, iri_to_uri, + uri_to_iri, ) from django.utils.http import urlquote_plus diff --git a/tests/utils_tests/test_functional.py b/tests/utils_tests/test_functional.py index e8956a7a29..5f7687edf5 100644 --- a/tests/utils_tests/test_functional.py +++ b/tests/utils_tests/test_functional.py @@ -1,6 +1,6 @@ import unittest -from django.utils.functional import lazy, lazy_property, cached_property +from django.utils.functional import cached_property, lazy, lazy_property class FunctionalTestCase(unittest.TestCase): diff --git a/tests/utils_tests/test_html.py b/tests/utils_tests/test_html.py index 6375f2280b..db49046682 100644 --- a/tests/utils_tests/test_html.py +++ b/tests/utils_tests/test_html.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from datetime import datetime import os +from datetime import datetime from unittest import TestCase from django.test import ignore_warnings diff --git a/tests/utils_tests/test_http.py b/tests/utils_tests/test_http.py index ac103f15d6..19bfa79f1a 100644 --- a/tests/utils_tests/test_http.py +++ b/tests/utils_tests/test_http.py @@ -1,12 +1,11 @@ from __future__ import unicode_literals -from datetime import datetime import sys import unittest +from datetime import datetime +from django.utils import http, six from django.utils.datastructures import MultiValueDict -from django.utils import http -from django.utils import six class TestUtilsHttp(unittest.TestCase): diff --git a/tests/utils_tests/test_ipv6.py b/tests/utils_tests/test_ipv6.py index 6cd0cebc84..802f0f596e 100644 --- a/tests/utils_tests/test_ipv6.py +++ b/tests/utils_tests/test_ipv6.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import unittest -from django.utils.ipv6 import is_valid_ipv6_address, clean_ipv6_address +from django.utils.ipv6 import clean_ipv6_address, is_valid_ipv6_address class TestUtilsIPv6(unittest.TestCase): diff --git a/tests/utils_tests/test_module/another_bad_module.py b/tests/utils_tests/test_module/another_bad_module.py index eac25c4aa5..766456242d 100644 --- a/tests/utils_tests/test_module/another_bad_module.py +++ b/tests/utils_tests/test_module/another_bad_module.py @@ -1,4 +1,5 @@ from . import site + content = 'Another Bad Module' site._registry.update({ diff --git a/tests/utils_tests/test_module/another_good_module.py b/tests/utils_tests/test_module/another_good_module.py index fd69a3b30c..eccdaa4c59 100644 --- a/tests/utils_tests/test_module/another_good_module.py +++ b/tests/utils_tests/test_module/another_good_module.py @@ -1,4 +1,5 @@ from . import site + content = 'Another Good Module' site._registry.update({ diff --git a/tests/utils_tests/test_module_loading.py b/tests/utils_tests/test_module_loading.py index 89c9d03b9e..f11bfa44cd 100644 --- a/tests/utils_tests/test_module_loading.py +++ b/tests/utils_tests/test_module_loading.py @@ -1,19 +1,20 @@ import imp -from importlib import import_module import os import sys import unittest import warnings +from importlib import import_module from zipimport import zipimporter from django.core.exceptions import ImproperlyConfigured from django.test import SimpleTestCase, ignore_warnings, modify_settings from django.test.utils import extend_sys_path from django.utils import six -from django.utils.deprecation import RemovedInDjango19Warning -from django.utils.module_loading import (autodiscover_modules, import_by_path, import_string, - module_has_submodule) from django.utils._os import upath +from django.utils.deprecation import RemovedInDjango19Warning +from django.utils.module_loading import ( + autodiscover_modules, import_by_path, import_string, module_has_submodule, +) class DefaultLoader(unittest.TestCase): diff --git a/tests/utils_tests/test_safestring.py b/tests/utils_tests/test_safestring.py index e23851815b..c3f18f12d4 100644 --- a/tests/utils_tests/test_safestring.py +++ b/tests/utils_tests/test_safestring.py @@ -1,13 +1,13 @@ from __future__ import unicode_literals -from django.template import Template, Context +from django.template import Context, Template from django.test import TestCase -from django.utils.encoding import force_text, force_bytes +from django.utils import html, six, text +from django.utils.encoding import force_bytes, force_text from django.utils.functional import lazy -from django.utils.safestring import mark_safe, mark_for_escaping, SafeData, EscapeData -from django.utils import six -from django.utils import text -from django.utils import html +from django.utils.safestring import ( + EscapeData, SafeData, mark_for_escaping, mark_safe, +) lazystr = lazy(force_text, six.text_type) lazybytes = lazy(force_bytes, bytes) diff --git a/tests/utils_tests/test_termcolors.py b/tests/utils_tests/test_termcolors.py index 9bbeb16f0c..6e1aa50124 100644 --- a/tests/utils_tests/test_termcolors.py +++ b/tests/utils_tests/test_termcolors.py @@ -1,7 +1,9 @@ import unittest -from django.utils.termcolors import (parse_color_setting, PALETTES, - DEFAULT_PALETTE, LIGHT_PALETTE, DARK_PALETTE, NOCOLOR_PALETTE, colorize) +from django.utils.termcolors import ( + DARK_PALETTE, DEFAULT_PALETTE, LIGHT_PALETTE, NOCOLOR_PALETTE, PALETTES, + colorize, parse_color_setting, +) class TermColorTests(unittest.TestCase): diff --git a/tests/utils_tests/test_timesince.py b/tests/utils_tests/test_timesince.py index 376e425a88..90d33d00f7 100644 --- a/tests/utils_tests/test_timesince.py +++ b/tests/utils_tests/test_timesince.py @@ -4,8 +4,8 @@ import datetime import unittest from django.test.utils import requires_tz_support -from django.utils.timesince import timesince, timeuntil from django.utils import timezone +from django.utils.timesince import timesince, timeuntil class TimesinceTests(unittest.TestCase): diff --git a/tests/utils_tests/test_timezone.py b/tests/utils_tests/test_timezone.py index 9414a6097e..5dff7e7b5a 100644 --- a/tests/utils_tests/test_timezone.py +++ b/tests/utils_tests/test_timezone.py @@ -3,14 +3,14 @@ import datetime import pickle import unittest +from django.test import override_settings +from django.utils import timezone + try: import pytz except ImportError: pytz = None -from django.test import override_settings -from django.utils import timezone - if pytz is not None: CET = pytz.timezone("Europe/Paris") diff --git a/tests/utils_tests/test_tzinfo.py b/tests/utils_tests/test_tzinfo.py index b1a08fb600..8081125c25 100644 --- a/tests/utils_tests/test_tzinfo.py +++ b/tests/utils_tests/test_tzinfo.py @@ -9,7 +9,6 @@ import warnings from django.test import ignore_warnings from django.utils.deprecation import RemovedInDjango19Warning - # Swallow the import-time warning to test the deprecated implementation. with warnings.catch_warnings(): warnings.filterwarnings("ignore", category=RemovedInDjango19Warning) |