summaryrefslogtreecommitdiff
path: root/django/template/loader.py
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2009-03-18 16:55:59 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2009-03-18 16:55:59 +0000
commitc485e236bd7e5ea40c64b2fe54d85dbb15b2fd39 (patch)
treefc5e86abf39b69181b2084f5c39038f1811b6b44 /django/template/loader.py
parentee2f04d79e5bca55637b9bb3301618738a4e342a (diff)
Fixed #8193: all dynamic imports in Django are now done correctly. I know this because Brett Cannon borrowed the time machine and brought Python 2.7's '`importlib` back for inclusion in Django. Thanks for the patch-from-the-future, Brett!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/template/loader.py')
-rw-r--r--django/template/loader.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/template/loader.py b/django/template/loader.py
index 1d7d945ef7..8195c4b798 100644
--- a/django/template/loader.py
+++ b/django/template/loader.py
@@ -22,6 +22,7 @@
from django.core.exceptions import ImproperlyConfigured
from django.template import Origin, Template, Context, TemplateDoesNotExist, add_to_builtins
+from django.utils.importlib import import_module
from django.conf import settings
template_source_loaders = None
@@ -51,7 +52,7 @@ def find_template_source(name, dirs=None):
i = path.rfind('.')
module, attr = path[:i], path[i+1:]
try:
- mod = __import__(module, globals(), locals(), [attr])
+ mod = import_module(module)
except ImportError, e:
raise ImproperlyConfigured, 'Error importing template source loader %s: "%s"' % (module, e)
try: