diff options
| author | Georg Brandl <georg@python.org> | 2012-01-29 11:28:09 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-01-29 11:28:09 +0100 |
| commit | d86a3a3e2f4ed37d5170617c8f6ef2a4a4508cea (patch) | |
| tree | 6e6f80b059a52bd68e24e66239d777e83ba7cecc | |
| parent | aa1fafc0db9949d1238b422f6eeff3ad8c206775 (diff) | |
| download | sphinx-d86a3a3e2f4ed37d5170617c8f6ef2a4a4508cea.tar.gz | |
Closes #854: Fix inheritance_diagram raising attribute errors on builtins.
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | sphinx/ext/inheritance_diagram.py | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -31,6 +31,8 @@ Release 1.1.3 (in development) * #852: Fix HtmlHelp index entry links again. +* #854: Fix inheritance_diagram raising attribute errors on builtins. + Release 1.1.2 (Nov 1, 2011) -- 1.1.1 is a silly version number anyway! ====================================================================== diff --git a/sphinx/ext/inheritance_diagram.py b/sphinx/ext/inheritance_diagram.py index a2490486..7dc57ab1 100644 --- a/sphinx/ext/inheritance_diagram.py +++ b/sphinx/ext/inheritance_diagram.py @@ -39,6 +39,7 @@ r""" import re import sys import inspect +import __builtin__ try: from hashlib import md5 except ImportError: @@ -142,7 +143,7 @@ class InheritanceGraph(object): displayed node names. """ all_classes = {} - builtins = __builtins__.values() + builtins = vars(__builtin__).values() def recurse(cls): if not show_builtins and cls in builtins: |