[Python-modules-commits] r33154 - in packages/sphinx/trunk/debian (3 files)

[barry at users.alioth.debian.org]

    Date: Monday, June 29, 2015 @ 15:15:33
  Author: barry
Revision: 33154

debian/patches/py35compat.diff: Python 3.5 compatibility.

Added:
  packages/sphinx/trunk/debian/patches/py35compat.diff
Modified:
  packages/sphinx/trunk/debian/changelog
  packages/sphinx/trunk/debian/patches/series

Modified: packages/sphinx/trunk/debian/changelog
===================================================================
--- packages/sphinx/trunk/debian/changelog	2015-06-29 14:49:00 UTC (rev 33153)
+++ packages/sphinx/trunk/debian/changelog	2015-06-29 15:15:33 UTC (rev 33154)
@@ -1,9 +1,13 @@
 sphinx (1.3.1-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
   * debian/patches/no_snowballstemmer.diff: Exclude snowballstemmer
     from setup.py and egg-info requirements.
   * Move the signing keys to debian/upstream/signing-key.asc.
 
+  [ Barry Warsaw ]
+  * debian/patches/py35compat.diff: Python 3.5 compatibility.
+
  -- Dmitry Shachnev <mitya57 at debian.org>  Fri, 08 May 2015 12:16:28 +0300
 
 sphinx (1.3.1-1) experimental; urgency=medium

Added: packages/sphinx/trunk/debian/patches/py35compat.diff
===================================================================
--- packages/sphinx/trunk/debian/patches/py35compat.diff	                        (rev 0)
+++ packages/sphinx/trunk/debian/patches/py35compat.diff	2015-06-29 15:15:33 UTC (rev 33154)
@@ -0,0 +1,30 @@
+Description: HTMLParserError is removed in Python 3.5.
+Origin: https://github.com/sphinx-doc/sphinx/pull/1946
+Author: Barry Warsaw <barry at debian.org>
+Bug: https://github.com/sphinx-doc/sphinx/issues/1945
+
+--- a/sphinx/builders/linkcheck.py
++++ b/sphinx/builders/linkcheck.py
+@@ -19,7 +19,7 @@
+ from six.moves.urllib.request import build_opener, Request, HTTPRedirectHandler
+ from six.moves.urllib.parse import unquote, urlsplit, quote
+ from six.moves.urllib.error import HTTPError
+-from six.moves.html_parser import HTMLParser, HTMLParseError
++from six.moves.html_parser import HTMLParser
+ from docutils import nodes
+ 
+ from sphinx.builders import Builder
+@@ -27,6 +27,13 @@
+     darkred, turquoise
+ from sphinx.util.pycompat import TextIOWrapper
+ 
++# 2015-06-29 barry at debian.org: Temporary fix for Python 3.5 compatibility.
++try:
++    from six.moves.html_parser import HTMLParseError
++except ImportError:
++    class HTMLParseError(Exception):
++        pass
++
+ 
+ class RedirectHandler(HTTPRedirectHandler):
+     """A RedirectHandler that records the redirect code we got."""

Modified: packages/sphinx/trunk/debian/patches/series
===================================================================
--- packages/sphinx/trunk/debian/patches/series	2015-06-29 14:49:00 UTC (rev 33153)
+++ packages/sphinx/trunk/debian/patches/series	2015-06-29 15:15:33 UTC (rev 33154)
@@ -3,3 +3,4 @@
 no_external_css.diff
 disable_js_version_check.diff
 no_snowballstemmer.diff
+py35compat.diff