From 23d2d534dfd9e3ed710795045c302a577bb8e488 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 7 Jan 2011 22:07:15 +0100 Subject: [PATCH 1/2] Non-dev Python docs are now Sphinx too. --- doc/_templates/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/_templates/index.html b/doc/_templates/index.html index 524b2ffb6..34dead7e6 100644 --- a/doc/_templates/index.html +++ b/doc/_templates/index.html @@ -12,7 +12,7 @@

Sphinx is a tool that makes it easy to create intelligent and beautiful documentation, written by Georg Brandl and licensed under the BSD license.

-

It was originally created for the +

It was originally created for the new Python documentation, and it has excellent facilities for the documentation of Python projects, but C/C++ is already supported as well, and it is planned to add special support for other languages as well. Of From 7955bc01c0e99d5a3dc0c93f9c2675126f446df3 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Fri, 7 Jan 2011 22:34:12 +0100 Subject: [PATCH 2/2] Fix a bug in the inheritance diagram exception that caused base classes to be skipped if one of them is a builtin. --- CHANGES | 3 +++ sphinx/ext/inheritance_diagram.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index a840d8cde..9a62f57f2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ Release 1.0.7 (in development) ============================== +* Fix a bug in the inheritance diagram exception that caused base + classes to be skipped if one of them is a builtin. + * Fix general index links for C++ domain objects. * #332: Make admonition boundaries in LaTeX output visible. diff --git a/sphinx/ext/inheritance_diagram.py b/sphinx/ext/inheritance_diagram.py index ad0c253ab..2e326e7e5 100644 --- a/sphinx/ext/inheritance_diagram.py +++ b/sphinx/ext/inheritance_diagram.py @@ -155,7 +155,7 @@ class InheritanceGraph(object): all_classes[cls] = (nodename, fullname, baselist) for base in cls.__bases__: if not show_builtins and base in builtins: - return + continue baselist.append(self.class_name(base, parts)) if base not in all_classes: recurse(base)