[Python-modules-commits] r24643 - in packages/sphinx/trunk/debian (5 files)

Tue Jun 4 16:03:40 UTC 2013

Date: Tuesday, June 4, 2013 @ 16:03:37
  Author: jwilk
Revision: 24643

Backport upstream patches to fix various 1.2 regressions.

Added:
  packages/sphinx/trunk/debian/patches/fix_copying_imgs_singlehtml_builder.diff
  packages/sphinx/trunk/debian/patches/fix_globaltoc_and_hidden_toctree.diff
  packages/sphinx/trunk/debian/patches/fix_missing_citation_target_assert.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series

Modified: packages/sphinx/trunk/debian/changelog
===================================================================

--- packages/sphinx/trunk/debian/changelog	2013-06-04 12:13:18 UTC (rev 24642)
+++ packages/sphinx/trunk/debian/changelog	2013-06-04 16:03:37 UTC (rev 24643)
@@ -4,8 +4,14 @@
     access at build time.
   * Use canonical URIs for Vcs-* fields.
   * Add texinfo to Build-Depends.
+  * Add patch (fix_copying_imgs_singlehtml_builder.diff) to fix copying images
+    in the singlehtml builder (closes: #706563).
+  * Add patch (fix_globaltoc_and_hidden_toctree.diff) to fix combination of
+    globaltoc and hidden toctree causing an exception (closes: #706586).
+  * Add patch (fix_missing_citation_target_assert.diff) to fix missing
+    citation target causing AssertionError (closes: #706565).
 
- -- Jakub Wilk <jwilk at debian.org>  Sat, 25 May 2013 00:09:26 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Tue, 04 Jun 2013 17:24:24 +0200
 
 sphinx (1.2~b1+dfsg-1) experimental; urgency=low
 

Added: packages/sphinx/trunk/debian/patches/fix_copying_imgs_singlehtml_builder.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_copying_imgs_singlehtml_builder.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/fix_copying_imgs_singlehtml_builder.diff	2013-06-04 16:03:37 UTC (rev 24643)
@@ -0,0 +1,16 @@
+Description: fix copying images in the singlehtml builder
+Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/b1773a9751e5
+Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1162
+Bug-Debian: http://bugs.debian.org/706563
+Last-Update: 2013-06-04
+
+--- a/sphinx/builders/html.py
++++ b/sphinx/builders/html.py
+@@ -938,6 +938,7 @@
+         doctree = self.assemble_doctree()
+         self.info()
+         self.info(bold('writing... '), nonl=True)
++        self.write_doc_serialized(self.config.master_doc, doctree)
+         self.write_doc(self.config.master_doc, doctree)
+         self.info('done')
+ 

Added: packages/sphinx/trunk/debian/patches/fix_globaltoc_and_hidden_toctree.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_globaltoc_and_hidden_toctree.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/fix_globaltoc_and_hidden_toctree.diff	2013-06-04 16:03:37 UTC (rev 24643)
@@ -0,0 +1,39 @@
+Description: fix combination of globaltoc and hidden toctree causing an exception
+Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/48a41f195c27
+Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1157
+Bug-Debian: http://bugs.debian.org/706586
+Last-Update: 2013-06-04
+
+--- a/sphinx/environment.py
++++ b/sphinx/environment.py
+@@ -1038,7 +1038,8 @@
+         for toctreenode in doctree.traverse(addnodes.toctree):
+             toctree = self.resolve_toctree(docname, builder, toctreenode,
+                                            prune=True, **kwds)
+-            toctrees.append(toctree)
++            if toctree:
++                toctrees.append(toctree)
+         if not toctrees:
+             return None
+         result = toctrees[0]
+--- a/tests/test_build_html.py
++++ b/tests/test_build_html.py
+@@ -344,3 +344,18 @@
+             yield check_xpath, etree, fname, path, check
+ 
+     check_static_entries(app.builder.outdir)
++
++ at with_app(buildername='html', srcdir='(empty)',
++          confoverrides={'html_sidebars': {'*': ['globaltoc.html']}},
++          )
++def test_html_with_globaltoc_and_hidden_toctree(app):
++    # issue #1157: combination of 'globaltoc.html' and hidden toctree cause 
++    # exception.
++    (app.srcdir / 'contents.rst').write_text(
++            '\n.. toctree::'
++            '\n'
++            '\n.. toctree::'
++            '\n   :hidden:'
++            '\n')
++    app.builder.build_all()
++

Added: packages/sphinx/trunk/debian/patches/fix_missing_citation_target_assert.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/fix_missing_citation_target_assert.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/fix_missing_citation_target_assert.diff	2013-06-04 16:03:37 UTC (rev 24643)
@@ -0,0 +1,61 @@
+Description: fix missing citation target causing AssertionError
+Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/commits/72dceb35264e
+Bug: https://bitbucket.org/birkenfeld/sphinx/issue/1160
+Bug-Debian: http://bugs.debian.org/706565
+Last-Update: 2013-06-04
+
+--- a/sphinx/environment.py
++++ b/sphinx/environment.py
+@@ -1343,6 +1343,10 @@
+                             if not isinstance(contnode, nodes.Element):
+                                 del node['ids'][:]
+                             raise
++                    elif 'ids' in node:
++                        # remove ids attribute that annotated at
++                        # transforms.CitationReference.apply.
++                        del node['ids'][:]
+                 # no new node found? try the missing-reference event
+                 if newnode is None:
+                     newnode = builder.app.emit_firstresult(
+--- a/tests/root/footnote.txt
++++ b/tests/root/footnote.txt
+@@ -38,3 +38,9 @@
+ .. rubric:: Citations
+ 
+ .. [bar] cite
++
++
++missing target
++--------------------
++[missing]_ citation
++
+--- a/tests/test_build_html.py
++++ b/tests/test_build_html.py
+@@ -49,6 +49,7 @@
+ 
+ HTML_WARNINGS = ENV_WARNINGS + """\
+ %(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*'
++None:\\d+: WARNING: citation not found: missing
+ %(root)s/markup.txt:: WARNING: invalid single index entry u''
+ %(root)s/markup.txt:: WARNING: invalid pair index entry u''
+ %(root)s/markup.txt:: WARNING: invalid pair index entry u'keyword; '
+--- a/tests/test_build_latex.py
++++ b/tests/test_build_latex.py
+@@ -29,6 +29,7 @@
+ latex_warnfile = StringIO()
+ 
+ LATEX_WARNINGS = ENV_WARNINGS + """\
++None:None: WARNING: citation not found: missing
+ None:None: WARNING: no matching candidate for image URI u'foo.\\*'
+ WARNING: invalid pair index entry u''
+ WARNING: invalid pair index entry u'keyword; '
+--- a/tests/test_build_texinfo.py
++++ b/tests/test_build_texinfo.py
+@@ -28,6 +28,7 @@
+ texinfo_warnfile = StringIO()
+ 
+ TEXINFO_WARNINGS = ENV_WARNINGS + """\
++None:None: WARNING: citation not found: missing
+ None:None: WARNING: no matching candidate for image URI u'foo.\\*'
+ None:None: WARNING: no matching candidate for image URI u'svgimg.\\*'
+ """

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2013-06-04 12:13:18 UTC (rev 24642)
+++ packages/sphinx/trunk/debian/patches/series	2013-06-04 16:03:37 UTC (rev 24643)
@@ -6,3 +6,6 @@
 skiptest_latex.diff
 parallel_2to3.diff
 no_external_css.diff
+fix_copying_imgs_singlehtml_builder.diff
+fix_globaltoc_and_hidden_toctree.diff
+fix_missing_citation_target_assert.diff


