diff options
author | Tim Graham <timograham@gmail.com> | 2015-01-28 07:35:27 -0500 |
---|---|---|
committer | Tim Graham <timograham@gmail.com> | 2015-02-06 08:16:28 -0500 |
commit | 0ed7d155635da9f79d4dd67e4889087d3673c6da (patch) | |
tree | cf5c59b563f01774f32e20b3af8cb24a387fdc4d /tests/test_client_regress | |
parent | 388d986b8a6bb1363dab9f53ea435dff4dfe92cb (diff) | |
download | django-0ed7d155635da9f79d4dd67e4889087d3673c6da.tar.gz |
Sorted imports with isort; refs #23860.
Diffstat (limited to 'tests/test_client_regress')
-rw-r--r-- | tests/test_client_regress/models.py | 2 | ||||
-rw-r--r-- | tests/test_client_regress/tests.py | 16 | ||||
-rw-r--r-- | tests/test_client_regress/urls.py | 3 | ||||
-rw-r--r-- | tests/test_client_regress/views.py | 2 |
4 files changed, 11 insertions, 12 deletions
diff --git a/tests/test_client_regress/models.py b/tests/test_client_regress/models.py index b72d4480bf..aebc93c91b 100644 --- a/tests/test_client_regress/models.py +++ b/tests/test_client_regress/models.py @@ -1,5 +1,5 @@ -from django.db import models from django.contrib.auth.models import AbstractBaseUser, BaseUserManager +from django.db import models class CustomUser(AbstractBaseUser): diff --git a/tests/test_client_regress/tests.py b/tests/test_client_regress/tests.py index c97ad550d1..fcceaf7346 100644 --- a/tests/test_client_regress/tests.py +++ b/tests/test_client_regress/tests.py @@ -4,21 +4,21 @@ Regression tests for the Test Client, especially the customized assertions. """ from __future__ import unicode_literals -import os import itertools +import os -from django.core.urlresolvers import reverse, NoReverseMatch -from django.template import TemplateSyntaxError, Context, engines +from django.contrib.auth.models import User +from django.contrib.auth.signals import user_logged_in, user_logged_out +from django.core.urlresolvers import NoReverseMatch, reverse +from django.http import HttpResponse +from django.template import Context, TemplateSyntaxError, engines +from django.template.response import SimpleTemplateResponse from django.test import Client, TestCase, ignore_warnings, override_settings from django.test.client import RedirectCycleError, RequestFactory, encode_file from django.test.utils import ContextList, str_prefix -from django.template.response import SimpleTemplateResponse -from django.utils.deprecation import RemovedInDjango20Warning from django.utils._os import upath +from django.utils.deprecation import RemovedInDjango20Warning from django.utils.translation import ugettext_lazy -from django.http import HttpResponse -from django.contrib.auth.signals import user_logged_out, user_logged_in -from django.contrib.auth.models import User from .models import CustomUser from .views import CustomTestException diff --git a/tests/test_client_regress/urls.py b/tests/test_client_regress/urls.py index a69a774555..fd7c131797 100644 --- a/tests/test_client_regress/urls.py +++ b/tests/test_client_regress/urls.py @@ -1,9 +1,8 @@ -from django.conf.urls import url, include +from django.conf.urls import include, url from django.views.generic import RedirectView from . import views - urlpatterns = [ url(r'', include('test_client.urls')), diff --git a/tests/test_client_regress/views.py b/tests/test_client_regress/views.py index 1c5e221a2a..6046564ee4 100644 --- a/tests/test_client_regress/views.py +++ b/tests/test_client_regress/views.py @@ -2,9 +2,9 @@ import json from django.conf import settings from django.contrib.auth.decorators import login_required +from django.core.serializers.json import DjangoJSONEncoder from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response -from django.core.serializers.json import DjangoJSONEncoder from django.template import RequestContext from django.template.loader import render_to_string from django.test import Client |