summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2009-04-01 18:44:25 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2009-04-01 18:44:25 +0000
commitf03f9568aa9eb79baac6f782f9ebc69e4a6001d4 (patch)
tree46905dc3157c2c53bcc1f1ce2df226c8ec6aad90
parent226ab592e2ef50c96cb1005eb7338552feef4735 (diff)
Do [10337] correctly; thanks, Alex.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10338 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/admindocs/views.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py
index 1d654df082..f66ea3e9b0 100644
--- a/django/contrib/admindocs/views.py
+++ b/django/contrib/admindocs/views.py
@@ -129,7 +129,7 @@ def view_index(request):
site_obj = GenericSite()
for (func, regex) in view_functions:
views.append({
- 'name': hasattr(func, '__class__') and func.__class__.__name__ or func.__name__,
+ 'name': getattr(func, '__name__', func.__class__.__name__),
'module': func.__module__,
'site_id': settings_mod.SITE_ID,
'site': site_obj,