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/view_tests | |
| parent | eb406aa686ff1809903366ef6896037af2f1f69b (diff) | |
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
Diffstat (limited to 'tests/view_tests')
| -rw-r--r-- | tests/view_tests/default_urls.py | 1 | ||||
| -rw-r--r-- | tests/view_tests/generic_urls.py | 2 | ||||
| -rw-r--r-- | tests/view_tests/templatetags/debugtags.py | 1 | ||||
| -rw-r--r-- | tests/view_tests/tests/test_csrf.py | 2 | ||||
| -rw-r--r-- | tests/view_tests/tests/test_debug.py | 13 | ||||
| -rw-r--r-- | tests/view_tests/tests/test_i18n.py | 7 | ||||
| -rw-r--r-- | tests/view_tests/tests/test_static.py | 2 | ||||
| -rw-r--r-- | tests/view_tests/urls.py | 3 | ||||
| -rw-r--r-- | tests/view_tests/views.py | 16 |
9 files changed, 25 insertions, 22 deletions
diff --git a/tests/view_tests/default_urls.py b/tests/view_tests/default_urls.py index 1e202472f4..2811bf7740 100644 --- a/tests/view_tests/default_urls.py +++ b/tests/view_tests/default_urls.py @@ -1,5 +1,4 @@ from django.conf.urls import include, url - from django.contrib import admin urlpatterns = [ diff --git a/tests/view_tests/generic_urls.py b/tests/view_tests/generic_urls.py index ed15f55486..9e73a07649 100644 --- a/tests/view_tests/generic_urls.py +++ b/tests/view_tests/generic_urls.py @@ -5,8 +5,8 @@ from django.conf.urls import url from django.contrib.auth import views as auth_views from django.views.generic import RedirectView -from .models import Article, DateArticle from . import views +from .models import Article, DateArticle date_based_info_dict = { 'queryset': Article.objects.all(), diff --git a/tests/view_tests/templatetags/debugtags.py b/tests/view_tests/templatetags/debugtags.py index 1b9f3f9828..443a89f32c 100644 --- a/tests/view_tests/templatetags/debugtags.py +++ b/tests/view_tests/templatetags/debugtags.py @@ -2,7 +2,6 @@ from django import template from ..views import BrokenException - register = template.Library() diff --git a/tests/view_tests/tests/test_csrf.py b/tests/view_tests/tests/test_csrf.py index 893a7e200b..d948dd2243 100644 --- a/tests/view_tests/tests/test_csrf.py +++ b/tests/view_tests/tests/test_csrf.py @@ -1,4 +1,4 @@ -from django.test import TestCase, override_settings, Client +from django.test import Client, TestCase, override_settings from django.utils.translation import override diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py index be6ceff1b5..1db85b7c2b 100644 --- a/tests/view_tests/tests/test_debug.py +++ b/tests/view_tests/tests/test_debug.py @@ -16,16 +16,17 @@ from django.core import mail from django.core.files.uploadedfile import SimpleUploadedFile from django.core.urlresolvers import reverse from django.template.base import TemplateDoesNotExist -from django.test import TestCase, RequestFactory, override_settings -from django.utils.encoding import force_text, force_bytes +from django.test import RequestFactory, TestCase, override_settings from django.utils import six +from django.utils.encoding import force_bytes, force_text from django.views.debug import CallableSettingWrapper, ExceptionReporter from .. import BrokenException, except_args -from ..views import (sensitive_view, non_sensitive_view, paranoid_view, - custom_exception_reporter_filter_view, sensitive_method_view, - sensitive_args_function_caller, sensitive_kwargs_function_caller, - multivalue_dict_key_error) +from ..views import ( + custom_exception_reporter_filter_view, multivalue_dict_key_error, + non_sensitive_view, paranoid_view, sensitive_args_function_caller, + sensitive_kwargs_function_caller, sensitive_method_view, sensitive_view, +) class CallableSettingWrapperTests(TestCase): diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py index 5185a5c458..597603ec8b 100644 --- a/tests/view_tests/tests/test_i18n.py +++ b/tests/view_tests/tests/test_i18n.py @@ -2,17 +2,18 @@ import gettext import json import os -from os import path import unittest +from os import path from django.conf import settings from django.core.urlresolvers import reverse from django.test import ( - LiveServerTestCase, TestCase, modify_settings, override_settings) + LiveServerTestCase, TestCase, modify_settings, override_settings, +) from django.utils import six from django.utils._os import upath from django.utils.module_loading import import_string -from django.utils.translation import override, LANGUAGE_SESSION_KEY +from django.utils.translation import LANGUAGE_SESSION_KEY, override from ..urls import locale_dir diff --git a/tests/view_tests/tests/test_static.py b/tests/view_tests/tests/test_static.py index 5a353806e1..f1b0bf5b75 100644 --- a/tests/view_tests/tests/test_static.py +++ b/tests/view_tests/tests/test_static.py @@ -1,8 +1,8 @@ from __future__ import unicode_literals import mimetypes -from os import path import unittest +from os import path from django.conf.urls.static import static from django.http import FileResponse, HttpResponseNotModified diff --git a/tests/view_tests/urls.py b/tests/view_tests/urls.py index 0dfc2d4446..0bfcd587c2 100644 --- a/tests/view_tests/urls.py +++ b/tests/view_tests/urls.py @@ -1,13 +1,12 @@ # -*- coding: utf-8 -*- from os import path -from django.conf.urls import url, include +from django.conf.urls import include, url from django.utils._os import upath from django.views import defaults, i18n, static from . import views - base_dir = path.dirname(path.abspath(upath(__file__))) media_dir = path.join(base_dir, 'media') locale_dir = path.join(base_dir, 'locale') diff --git a/tests/view_tests/views.py b/tests/view_tests/views.py index 16bee28248..4be67bfc6f 100644 --- a/tests/view_tests/views.py +++ b/tests/view_tests/views.py @@ -6,14 +6,18 @@ import sys from django.core.exceptions import PermissionDenied, SuspiciousOperation from django.core.urlresolvers import get_resolver -from django.http import HttpResponse, HttpResponseRedirect, JsonResponse, Http404 -from django.shortcuts import render_to_response, render +from django.http import ( + Http404, HttpResponse, HttpResponseRedirect, JsonResponse, +) +from django.shortcuts import render, render_to_response from django.template import TemplateDoesNotExist -from django.views.debug import technical_500_response, SafeExceptionReporterFilter -from django.views.decorators.debug import (sensitive_post_parameters, - sensitive_variables) from django.utils.log import getLogger - +from django.views.debug import ( + SafeExceptionReporterFilter, technical_500_response, +) +from django.views.decorators.debug import ( + sensitive_post_parameters, sensitive_variables, +) from django.views.generic import View from . import BrokenException, except_args |
