diff options
| author | Gary Wilson Jr <gary.wilson@gmail.com> | 2009-03-30 20:16:43 +0000 |
|---|---|---|
| committer | Gary Wilson Jr <gary.wilson@gmail.com> | 2009-03-30 20:16:43 +0000 |
| commit | daae84a8e0c292b77aabd5719d3022df72f47fc8 (patch) | |
| tree | 8caf35c99ea6c129d06181404cefffb9d00747d9 | |
| parent | ef283643651141363cdf50bded17ef9ddd729d99 (diff) | |
[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
| -rw-r--r-- | django/template/context.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 = [] |
