mirror of
https://github.com/django/django.git
synced 2024-12-23 01:25:58 +00:00
Fixed #23525 -- Fixed admindocs crash on apps installed as eggs.
Thanks welbornprod for report and initial patch.
This commit is contained in:
parent
cf2390be16
commit
01ab84c613
@ -315,6 +315,10 @@ def load_all_installed_template_libraries():
|
||||
# Load/register all template tag libraries from installed apps.
|
||||
for module_name in template.get_templatetags_modules():
|
||||
mod = import_module(module_name)
|
||||
if not hasattr(mod, '__file__'):
|
||||
# e.g. packages installed as eggs
|
||||
continue
|
||||
|
||||
try:
|
||||
libraries = [
|
||||
os.path.splitext(p)[0]
|
||||
@ -322,12 +326,13 @@ def load_all_installed_template_libraries():
|
||||
if p.endswith('.py') and p[0].isalpha()
|
||||
]
|
||||
except OSError:
|
||||
libraries = []
|
||||
for library_name in libraries:
|
||||
try:
|
||||
template.get_library(library_name)
|
||||
except template.InvalidTemplateLibrary:
|
||||
pass
|
||||
continue
|
||||
else:
|
||||
for library_name in libraries:
|
||||
try:
|
||||
template.get_library(library_name)
|
||||
except template.InvalidTemplateLibrary:
|
||||
pass
|
||||
|
||||
|
||||
def get_return_data_type(func_name):
|
||||
|
@ -160,3 +160,5 @@ Bugfixes
|
||||
a crash when the index name requires it (:ticket:`#24015`).
|
||||
|
||||
* Added ``datetime.time`` support to migrations questioner (:ticket:`23998`).
|
||||
|
||||
* Fixed admindocs crash on apps installed as eggs (:ticket:`23525`).
|
||||
|
Loading…
Reference in New Issue
Block a user