From 34263c67b4315bb326c15d23bdf0363b3a372e17 Mon Sep 17 00:00:00 2001
From: Baptiste Mispelon <bmispelon@gmail.com>
Date: Sun, 19 Jan 2014 20:11:32 +0100
Subject: [PATCH] Moved the loader tags registration with the other builtins.
---
django/template/base.py | 1 +
django/template/loader.py | 4 +---
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/django/template/base.py b/django/template/base.py
index 883609cf3e..e05395490e 100644
--- a/django/template/base.py
+++ b/django/template/base.py
@@ -1354,3 +1354,4 @@ def add_to_builtins(module):
add_to_builtins('django.template.defaulttags')
add_to_builtins('django.template.defaultfilters')
+add_to_builtins('django.template.loader_tags')
diff --git a/django/template/loader.py b/django/template/loader.py
index 3465a7141e..1e18eecc02 100644
--- a/django/template/loader.py
+++ b/django/template/loader.py
@@ -26,7 +26,7 @@
# installed, because pkg_resources is necessary to read eggs.
from django.core.exceptions import ImproperlyConfigured
-from django.template.base import Origin, Template, Context, TemplateDoesNotExist, add_to_builtins
+from django.template.base import Origin, Template, Context, TemplateDoesNotExist
from django.conf import settings
from django.utils.module_loading import import_by_path
from django.utils import six
@@ -191,5 +191,3 @@ def select_template(template_name_list, dirs=None):
continue
# If we get here, none of the templates could be loaded
raise TemplateDoesNotExist(', '.join(not_found))
-
-add_to_builtins('django.template.loader_tags')