diff options
Diffstat (limited to 'tests/admin_widgets')
| -rw-r--r-- | tests/admin_widgets/models.py | 2 | ||||
| -rw-r--r-- | tests/admin_widgets/tests.py | 20 | ||||
| -rw-r--r-- | tests/admin_widgets/urls.py | 1 |
3 files changed, 10 insertions, 13 deletions
diff --git a/tests/admin_widgets/models.py b/tests/admin_widgets/models.py index 5d65dcd174..5f990bdce3 100644 --- a/tests/admin_widgets/models.py +++ b/tests/admin_widgets/models.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from django.db import models from django.contrib.auth.models import User +from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py index 42271ae7f9..8d74f0b53c 100644 --- a/tests/admin_widgets/tests.py +++ b/tests/admin_widgets/tests.py @@ -1,17 +1,12 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from datetime import datetime, timedelta import gettext -from importlib import import_module import os +from datetime import datetime, timedelta +from importlib import import_module from unittest import TestCase, skipIf -try: - import pytz -except ImportError: - pytz = None - from django import forms from django.conf import settings from django.contrib import admin @@ -21,14 +16,17 @@ from django.core.files.storage import default_storage from django.core.files.uploadedfile import SimpleUploadedFile from django.core.urlresolvers import reverse from django.db.models import CharField, DateField -from django.test import TestCase as DjangoTestCase -from django.test import override_settings -from django.utils import six -from django.utils import translation +from django.test import TestCase as DjangoTestCase, override_settings +from django.utils import six, translation from . import models from .widgetadmin import site as widget_admin_site +try: + import pytz +except ImportError: + pytz = None + admin_static_prefix = lambda: { 'ADMIN_STATIC_PREFIX': "%sadmin/" % settings.STATIC_URL, diff --git a/tests/admin_widgets/urls.py b/tests/admin_widgets/urls.py index 3b3e9b1488..7f4721c57e 100644 --- a/tests/admin_widgets/urls.py +++ b/tests/admin_widgets/urls.py @@ -2,7 +2,6 @@ from django.conf.urls import include, url from . import widgetadmin - urlpatterns = [ url(r'^', include(widgetadmin.site.urls)), ] |
