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
This commit is contained in:
parent
91c67bcd45
commit
1dc6d4b265
|
@ -4,8 +4,8 @@ from django.conf import settings
|
||||||
from django.models.core import sites
|
from django.models.core import sites
|
||||||
from django.core.extensions import DjangoContext, render_to_response
|
from django.core.extensions import DjangoContext, render_to_response
|
||||||
from django.core.exceptions import Http404, ViewDoesNotExist
|
from django.core.exceptions import Http404, ViewDoesNotExist
|
||||||
from django.core import template, template_loader, urlresolvers
|
from django.core import template, urlresolvers
|
||||||
from django.core.template import defaulttags, defaultfilters
|
from django.core.template import defaulttags, defaultfilters, loader
|
||||||
try:
|
try:
|
||||||
from django.parts.admin import doc
|
from django.parts.admin import doc
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
@ -223,7 +223,7 @@ def load_all_installed_template_libraries():
|
||||||
# Clear out and reload default tags
|
# Clear out and reload default tags
|
||||||
template.registered_tags.clear()
|
template.registered_tags.clear()
|
||||||
reload(defaulttags)
|
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
|
# Load any template tag libraries from installed apps
|
||||||
for e in templatetags.__path__:
|
for e in templatetags.__path__:
|
||||||
|
|
Loading…
Reference in New Issue