Author: gwilson
Date: 2009-03-30 15:16:43 -0500 (Mon, 30 Mar 2009)
New Revision: 10210
Modified:
django/branches/releases/1.0.X/django/template/context.py
Log:
[1.0.X]: 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.
Backport of r10209 from trunk.
Modified: django/branches/releases/1.0.X/django/template/context.py
===================================================================
--- django/branches/releases/1.0.X/django/template/context.py 2009-03-30
20:15:01 UTC (rev 10209)
+++ django/branches/releases/1.0.X/django/template/context.py 2009-03-30
20:16:43 UTC (rev 10210)
@@ -1,4 +1,3 @@
-from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
_standard_context_processors = None
@@ -70,6 +69,7 @@
# 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 = []
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---