[Python-modules-commits] r20316 - in packages/sphinx/branches/1.1/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Saturday, February 4, 2012 @ 22:50:59
  Author: jwilk
Revision: 20316

Make sphinx-autogen initialize the sphinx.ext.autodoc module.

Added:
  packages/sphinx/branches/1.1/debian/patches/initialize_autodoc.diff
Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/patches/series

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog	2012-02-04 22:46:50 UTC (rev 20315)
+++ packages/sphinx/branches/1.1/debian/changelog	2012-02-04 22:50:59 UTC (rev 20316)
@@ -1,8 +1,10 @@
 sphinx (1.1.2+dfsg-3) UNRELEASED; urgency=low
 
   * Use xargs to iterate over all Python versions.
+  * Make sphinx-autogen initialize the sphinx.ext.autodoc module (hopefully
+    closes: #611078).
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 04 Feb 2012 23:18:34 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 04 Feb 2012 23:49:46 +0100
 
 sphinx (1.1.2+dfsg-2) experimental; urgency=low
 

Added: packages/sphinx/branches/1.1/debian/patches/initialize_autodoc.diff
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/initialize_autodoc.diff	                        (rev 0)
+++ packages/sphinx/branches/1.1/debian/patches/initialize_autodoc.diff	2012-02-04 22:50:59 UTC (rev 20316)
@@ -0,0 +1,33 @@
+Description: Make sphinx-autogen initialize the sphinx.ext.autodoc module.
+Author: Jakub Wilk <jwilk at debian.org>
+Bug-Debian: http://bugs.debian.org/611078
+Bug: https://bitbucket.org/birkenfeld/sphinx/issue/618
+Forwarded: yes
+Last-Update: 2012-02-04
+
+--- a/sphinx/ext/autosummary/generate.py
++++ b/sphinx/ext/autosummary/generate.py
+@@ -27,6 +27,7 @@
+ from jinja2 import FileSystemLoader, TemplateNotFound
+ from jinja2.sandbox import SandboxedEnvironment
+ 
++from sphinx.ext import autodoc
+ from sphinx import package_dir
+ from sphinx.ext.autosummary import import_by_name, get_documenter
+ from sphinx.jinja2glue import BuiltinTemplateLoader
+@@ -50,6 +51,15 @@
+     if len(args) < 1:
+         p.error('no input files given')
+ 
++    class Sphinx(object):
++        def add_autodocumenter(self, cls):
++            autodoc.add_documenter(cls)
++        def add_event(self, name):
++            pass
++        def add_config_value(self, name, default, rebuild):
++            pass
++    autodoc.setup(Sphinx())
++
+     generate_autosummary_docs(args, options.output_dir,
+                               "." + options.suffix,
+                               template_dir=options.templates)

Modified: packages/sphinx/branches/1.1/debian/patches/series
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/series	2012-02-04 22:46:50 UTC (rev 20315)
+++ packages/sphinx/branches/1.1/debian/patches/series	2012-02-04 22:50:59 UTC (rev 20316)
@@ -1,4 +1,5 @@
 disable_distribute_setup.diff
 unversioned_grammar_pickle.diff
 show_more_stack_frames.diff
+initialize_autodoc.diff
 sphinxcontrib_namespace.diff