[1.7.x] Fixed #23525 -- Fixed admindocs crash on apps installed as eggs.

Thanks welbornprod for report and initial patch.

Backport of 01ab84c613 from master
This commit is contained in:
Tim Graham 2014-12-22 15:13:47 -05:00
parent 4c92ecd705
commit ac098867c0
2 changed files with 13 additions and 6 deletions

View File

@ -309,6 +309,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]
@ -316,7 +320,8 @@ def load_all_installed_template_libraries():
if p.endswith('.py') and p[0].isalpha()
]
except OSError:
libraries = []
continue
else:
for library_name in libraries:
try:
template.get_library(library_name)

View File

@ -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`).