1
0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00

[1.8.x] Sorted imports with isort; refs #23860.

Backport of 0ed7d15563 from master
This commit is contained in:
Tim Graham
2015-02-09 13:19:34 -05:00
parent eb406aa686
commit a8b70d251d
819 changed files with 2631 additions and 2401 deletions

View File

@@ -9,23 +9,21 @@ import sys
import types
import unittest
from django.template import Context, TemplateDoesNotExist, loader
from django.template.engine import Engine
from django.template.loaders import cached, eggs
from django.test import SimpleTestCase, ignore_warnings, override_settings
from django.utils import six
from django.utils._os import upath
from django.utils.deprecation import RemovedInDjango20Warning
from django.utils.six import StringIO
try:
import pkg_resources
except ImportError:
pkg_resources = None
from django.template import TemplateDoesNotExist, Context
from django.template.loaders import cached, eggs
from django.template.engine import Engine
from django.template import loader
from django.test import SimpleTestCase, ignore_warnings, override_settings
from django.utils import six
from django.utils.deprecation import RemovedInDjango20Warning
from django.utils._os import upath
from django.utils.six import StringIO
TEMPLATES_DIR = os.path.join(os.path.dirname(upath(__file__)), 'templates')
GLOBAL_TEMPLATES_DIR = os.path.join(os.path.dirname(os.path.dirname(upath(__file__))), 'templates')