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 /django/template/base.py | |
| parent | eb406aa686ff1809903366ef6896037af2f1f69b (diff) | |
[1.8.x] Sorted imports with isort; refs #23860.
Backport of 0ed7d155635da9f79d4dd67e4889087d3673c6da from master
Diffstat (limited to 'django/template/base.py')
| -rw-r--r-- | django/template/base.py | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/django/template/base.py b/django/template/base.py index 6594af1e1a..b9fd47625b 100644 --- a/django/template/base.py +++ b/django/template/base.py @@ -52,30 +52,32 @@ u'<html></html>' from __future__ import unicode_literals import re +import warnings from functools import partial from importlib import import_module from inspect import getargspec, getcallargs -import warnings from django.apps import apps -from django.template.context import (BaseContext, Context, RequestContext, # NOQA: imported for backwards compatibility - ContextPopException) -from django.utils import lru_cache +from django.template.context import ( # NOQA: imported for backwards compatibility + BaseContext, Context, ContextPopException, RequestContext, +) +from django.utils import lru_cache, six from django.utils.deprecation import RemovedInDjango20Warning -from django.utils.itercompat import is_iterable -from django.utils.text import (smart_split, unescape_string_literal, - get_text_list) -from django.utils.encoding import force_str, force_text -from django.utils.translation import ugettext_lazy, pgettext_lazy -from django.utils.safestring import (SafeData, EscapeData, mark_safe, - mark_for_escaping) +from django.utils.encoding import ( + force_str, force_text, python_2_unicode_compatible, +) from django.utils.formats import localize from django.utils.html import conditional_escape +from django.utils.itercompat import is_iterable from django.utils.module_loading import module_has_submodule -from django.utils import six +from django.utils.safestring import ( + EscapeData, SafeData, mark_for_escaping, mark_safe, +) +from django.utils.text import ( + get_text_list, smart_split, unescape_string_literal, +) from django.utils.timezone import template_localtime -from django.utils.encoding import python_2_unicode_compatible - +from django.utils.translation import pgettext_lazy, ugettext_lazy TOKEN_TEXT = 0 TOKEN_VAR = 1 |