Permalink
Browse files

[1.0.X]: Fixed #10079 -- Moved settings import inside the function th…

…at uses it so that the module can be imported without needing settings, thanks kcarnold and mcroydon.

Backport of r10209 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10210 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent ef28364 commit daae84a8e0c292b77aabd5719d3022df72f47fc8 @gdub gdub committed Mar 30, 2009
Showing with 1 addition and 1 deletion.
  1. +1 −1 django/template/context.py
@@ -1,4 +1,3 @@
-from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
_standard_context_processors = None
@@ -70,6 +69,7 @@ def update(self, other_dict):
# 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 = []

0 comments on commit daae84a

Please sign in to comment.