diff options
Diffstat (limited to 'django/shortcuts.py')
| -rw-r--r-- | django/shortcuts.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/django/shortcuts.py b/django/shortcuts.py index bbfc99299f..415e51887e 100644 --- a/django/shortcuts.py +++ b/django/shortcuts.py @@ -6,16 +6,18 @@ for convenience's sake. import warnings -from django.template import loader, RequestContext -from django.template.context import _current_app_undefined -from django.template.engine import ( - _context_instance_undefined, _dictionary_undefined, _dirs_undefined) -from django.http import HttpResponse, Http404 -from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect +from django.core import urlresolvers from django.db.models.base import ModelBase from django.db.models.manager import Manager from django.db.models.query import QuerySet -from django.core import urlresolvers +from django.http import ( + Http404, HttpResponse, HttpResponsePermanentRedirect, HttpResponseRedirect, +) +from django.template import RequestContext, loader +from django.template.context import _current_app_undefined +from django.template.engine import ( + _context_instance_undefined, _dictionary_undefined, _dirs_undefined, +) from django.utils import six from django.utils.deprecation import RemovedInDjango20Warning from django.utils.encoding import force_text |
