summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-12-22 15:13:47 -0500
committerTim Graham <timograham@gmail.com>2014-12-22 15:19:48 -0500
commitac098867c004b7336aac30d0689e70fbd73a7306 (patch)
tree20ce10e35c9182b163345c22f614770321c11a85
parent4c92ecd70592a7f64d8890ce2b0d67017512636a (diff)
[1.7.x] Fixed #23525 -- Fixed admindocs crash on apps installed as eggs.
Thanks welbornprod for report and initial patch. Backport of 01ab84c61330ffa5ac87c637249611c5e5343e57 from master
-rw-r--r--django/contrib/admindocs/views.py17
-rw-r--r--docs/releases/1.7.2.txt2
2 files changed, 13 insertions, 6 deletions
diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py
index 06f8844c03..1c093901b3 100644
--- a/django/contrib/admindocs/views.py
+++ b/django/contrib/admindocs/views.py
@@ -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,12 +320,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):
diff --git a/docs/releases/1.7.2.txt b/docs/releases/1.7.2.txt
index ef65a37963..179bd5f7db 100644
--- a/docs/releases/1.7.2.txt
+++ b/docs/releases/1.7.2.txt
@@ -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`).