summaryrefslogtreecommitdiff
path: root/django/template/__init__.py
diff options
context:
space:
mode:
authorPreston Timmons <prestontimmons@gmail.com>2015-05-08 15:10:36 -0500
committerPreston Timmons <prestontimmons@gmail.com>2015-05-21 09:12:06 -0500
commit655f52491505932ef04264de2bce21a03f3a7cd0 (patch)
treec38eca24b887466fc2385fc773ff34247567c732 /django/template/__init__.py
parent7b8008a078ffdfd18ebbe78fecbb92cdddf2f304 (diff)
Fixed #17085, #24783 -- Refactored template library registration.
* Converted the ``libraries`` and ``builtins`` globals of ``django.template.base`` into properties of the Engine class. * Added a public API for explicit registration of libraries and builtins.
Diffstat (limited to 'django/template/__init__.py')
-rw-r--r--django/template/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/template/__init__.py b/django/template/__init__.py
index cd1bf167c8..20f4986837 100644
--- a/django/template/__init__.py
+++ b/django/template/__init__.py
@@ -66,7 +66,7 @@ from .base import (Context, Node, NodeList, Origin, RequestContext, # NOQA
from .base import resolve_variable # NOQA
# Library management
-from .base import Library # NOQA
+from .library import Library # NOQA
__all__ += ('Template', 'Context', 'RequestContext')