summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2009-03-30 20:15:01 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2009-03-30 20:15:01 +0000
commit9ac3905f013da7d9df997698c6d09c327b0f4dae (patch)
tree5c1f7e7a752546dac8972a81dd8359801c0a8fd6
parentef933f164350d8dffa422eeb9014ab60d3025f03 (diff)
Fixed #10079 -- Moved settings import inside the function that uses it so that the module can be imported without needing settings, thanks kcarnold and mcroydon.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/template/context.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/template/context.py b/django/template/context.py
index 1f136595e1..0ccb5faecf 100644
--- a/django/template/context.py
+++ b/django/template/context.py
@@ -1,4 +1,3 @@
-from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.utils.importlib import import_module
@@ -71,6 +70,7 @@ class Context(object):
# This is a function rather than module-level procedural code because we only
# want it to execute if somebody uses RequestContext.
def get_standard_processors():
+ from django.conf import settings
global _standard_context_processors
if _standard_context_processors is None:
processors = []