summaryrefslogtreecommitdiff
path: root/django/views
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-10-18 04:36:28 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-10-18 04:36:28 +0000
commit1dc6d4b26506fe3d8c5e72aa958b8e82ea9975be (patch)
treebf07eeab3053a45f472b99d908a8a61d658510da /django/views
parent91c67bcd45facfc55abc8e7afcfc4af2732bac7f (diff)
Changed django.views.admin.doc to use template.loader instead of template_loader
git-svn-id: http://code.djangoproject.com/svn/django/trunk@922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/views')
-rw-r--r--django/views/admin/doc.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/views/admin/doc.py b/django/views/admin/doc.py
index 64785385c4..e7e791b2e4 100644
--- a/django/views/admin/doc.py
+++ b/django/views/admin/doc.py
@@ -4,8 +4,8 @@ from django.conf import settings
from django.models.core import sites
from django.core.extensions import DjangoContext, render_to_response
from django.core.exceptions import Http404, ViewDoesNotExist
-from django.core import template, template_loader, urlresolvers
-from django.core.template import defaulttags, defaultfilters
+from django.core import template, urlresolvers
+from django.core.template import defaulttags, defaultfilters, loader
try:
from django.parts.admin import doc
except ImportError:
@@ -223,7 +223,7 @@ def load_all_installed_template_libraries():
# Clear out and reload default tags
template.registered_tags.clear()
reload(defaulttags)
- reload(template_loader) # template_loader defines the block/extends tags
+ reload(loader) # loader defines the block/extends tags
# Load any template tag libraries from installed apps
for e in templatetags.__path__: