From a8b70d251d238b4e6cfc7bb4296da15494f8dff3 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 9 Feb 2015 13:19:34 -0500 Subject: [1.8.x] Sorted imports with isort; refs #23860. Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master --- tests/logging_tests/tests.py | 9 ++++----- tests/logging_tests/views.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'tests/logging_tests') diff --git a/tests/logging_tests/tests.py b/tests/logging_tests/tests.py index af03e47d09..1e43e9cef9 100644 --- a/tests/logging_tests/tests.py +++ b/tests/logging_tests/tests.py @@ -4,22 +4,21 @@ from __future__ import unicode_literals import logging import warnings +from admin_scripts.tests import AdminScriptTestCase + from django.core import mail from django.core.files.temp import NamedTemporaryFile -from django.test import TestCase, RequestFactory, override_settings +from django.test import RequestFactory, TestCase, override_settings from django.test.utils import patch_logger -from django.utils.encoding import force_text from django.utils.deprecation import RemovedInNextVersionWarning +from django.utils.encoding import force_text from django.utils.log import ( AdminEmailHandler, CallbackFilter, RequireDebugFalse, RequireDebugTrue, ) from django.utils.six import StringIO -from admin_scripts.tests import AdminScriptTestCase - from .logconfig import MyEmailBackend - # logging config prior to using filter with mail_admins OLD_LOGGING = { 'version': 1, diff --git a/tests/logging_tests/views.py b/tests/logging_tests/views.py index c685bcc005..77186be329 100644 --- a/tests/logging_tests/views.py +++ b/tests/logging_tests/views.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from django.core.exceptions import SuspiciousOperation, DisallowedHost +from django.core.exceptions import DisallowedHost, SuspiciousOperation def suspicious(request): -- cgit v1.3