diff options
| author | Tim Graham <timograham@gmail.com> | 2015-02-09 13:19:34 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-02-09 14:24:06 -0500 |
| commit | a8b70d251d238b4e6cfc7bb4296da15494f8dff3 (patch) | |
| tree | 94ef5bc53e59131906aecfcf792eeac86242aa62 /tests/generic_views | |
| parent | eb406aa686ff1809903366ef6896037af2f1f69b (diff) | |
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
Diffstat (limited to 'tests/generic_views')
| -rw-r--r-- | tests/generic_views/test_base.py | 8 | ||||
| -rw-r--r-- | tests/generic_views/test_edit.py | 4 | ||||
| -rw-r--r-- | tests/generic_views/test_list.py | 4 | ||||
| -rw-r--r-- | tests/generic_views/urls.py | 4 | ||||
| -rw-r--r-- | tests/generic_views/views.py | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/tests/generic_views/test_base.py b/tests/generic_views/test_base.py index 5c6ac24283..101eaffc2f 100644 --- a/tests/generic_views/test_base.py +++ b/tests/generic_views/test_base.py @@ -6,11 +6,13 @@ import warnings from django.core.exceptions import ImproperlyConfigured from django.http import HttpResponse +from django.test import ( + RequestFactory, TestCase, ignore_warnings, override_settings, +) +from django.test.utils import require_jinja2 from django.utils import six from django.utils.deprecation import RemovedInDjango19Warning -from django.test import TestCase, RequestFactory, ignore_warnings, override_settings -from django.test.utils import require_jinja2 -from django.views.generic import View, TemplateView, RedirectView +from django.views.generic import RedirectView, TemplateView, View from . import views diff --git a/tests/generic_views/test_edit.py b/tests/generic_views/test_edit.py index b61a11086a..91d0d20ff7 100644 --- a/tests/generic_views/test_edit.py +++ b/tests/generic_views/test_edit.py @@ -2,14 +2,14 @@ from __future__ import unicode_literals import warnings +from django import forms from django.core.exceptions import ImproperlyConfigured from django.core.urlresolvers import reverse -from django import forms from django.test import TestCase, ignore_warnings, override_settings from django.test.client import RequestFactory from django.utils.deprecation import RemovedInDjango20Warning from django.views.generic.base import View -from django.views.generic.edit import FormMixin, ModelFormMixin, CreateView +from django.views.generic.edit import CreateView, FormMixin, ModelFormMixin from . import views from .models import Artist, Author diff --git a/tests/generic_views/test_list.py b/tests/generic_views/test_list.py index f5b91c74bb..b9274242c9 100644 --- a/tests/generic_views/test_list.py +++ b/tests/generic_views/test_list.py @@ -4,10 +4,10 @@ import datetime from django.core.exceptions import ImproperlyConfigured from django.test import TestCase, override_settings -from django.views.generic.base import View from django.utils.encoding import force_str +from django.views.generic.base import View -from .models import Author, Artist, Book +from .models import Artist, Author, Book @override_settings(ROOT_URLCONF='generic_views.urls') diff --git a/tests/generic_views/urls.py b/tests/generic_views/urls.py index 1bef0a8b77..382cfe5f1b 100644 --- a/tests/generic_views/urls.py +++ b/tests/generic_views/urls.py @@ -6,9 +6,7 @@ from django.contrib.auth import views as auth_views from django.views.decorators.cache import cache_page from django.views.generic import TemplateView -from . import models -from . import views - +from . import models, views urlpatterns = [ # TemplateView diff --git a/tests/generic_views/views.py b/tests/generic_views/views.py index fe7fb88876..6dcac21aa6 100644 --- a/tests/generic_views/views.py +++ b/tests/generic_views/views.py @@ -6,8 +6,8 @@ from django.core.urlresolvers import reverse, reverse_lazy from django.utils.decorators import method_decorator from django.views import generic +from .models import Artist, Author, Book, BookSigning, Page from .test_forms import AuthorForm, ContactForm -from .models import Artist, Author, Book, Page, BookSigning class CustomTemplateView(generic.TemplateView): |
