diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-03-18 16:55:59 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-03-18 16:55:59 +0000 |
| commit | c485e236bd7e5ea40c64b2fe54d85dbb15b2fd39 (patch) | |
| tree | fc5e86abf39b69181b2084f5c39038f1811b6b44 /django/templatetags | |
| parent | ee2f04d79e5bca55637b9bb3301618738a4e342a (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/templatetags')
| -rw-r--r-- | django/templatetags/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/django/templatetags/__init__.py b/django/templatetags/__init__.py index 9204535abb..4033e5a8f6 100644 --- a/django/templatetags/__init__.py +++ b/django/templatetags/__init__.py @@ -1,7 +1,8 @@ from django.conf import settings +from django.utils import importlib for a in settings.INSTALLED_APPS: try: - __path__.extend(__import__(a + '.templatetags', {}, {}, ['']).__path__) + __path__.extend(importlib.import_module('.templatetags', a).__path__) except ImportError: pass |