From daae84a8e0c292b77aabd5719d3022df72f47fc8 Mon Sep 17 00:00:00 2001 From: Gary Wilson Jr Date: Mon, 30 Mar 2009 20:16:43 +0000 Subject: [PATCH] [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. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10210 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/template/context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/template/context.py b/django/template/context.py index 8f16a95021..c4e79f7d18 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 _standard_context_processors = None @@ -70,6 +69,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 = []