From ce4657b769de0292149c3320a17d0f5c90243163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 4 Nov 2015 10:40:14 +0100 Subject: [PATCH] pythonPackages.sphinx: apply a patch to support py35 --- .../python-modules/sphinx-1.3.1-pr-1946.patch | 35 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch diff --git a/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch b/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch new file mode 100644 index 000000000000..2933040141aa --- /dev/null +++ b/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch @@ -0,0 +1,35 @@ +From 7ce3b991229c74262f81ab7692a1dc6bde2416ee Mon Sep 17 00:00:00 2001 +From: Barry Warsaw +Date: Thu, 25 Jun 2015 11:54:05 -0400 +Subject: [PATCH] One way to work around the lack of + html.parser.HTMLParserError in Python 3.5 + +--- + sphinx/builders/linkcheck.py | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/sphinx/builders/linkcheck.py b/sphinx/builders/linkcheck.py +index 9f5c213..b05c5b2 100644 +--- a/sphinx/builders/linkcheck.py ++++ b/sphinx/builders/linkcheck.py +@@ -19,9 +19,19 @@ + 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 + ++# 2015-06-25 barry@python.org. This exception was deprecated in Python 3.3 and ++# removed in Python 3.5, however for backward compatibility reasons, we're not ++# going to just remove it. If it doesn't exist, define an exception that will ++# never be caught but leaves the code in check_anchor() intact. ++try: ++ from six.moves.html_parser import HTMLParseError ++except ImportError: ++ class HTMLParseError(Exception): ++ pass ++ + from sphinx.builders import Builder + from sphinx.util.console import purple, red, darkgreen, darkgray, \ + darkred, turquoise diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 501c6eaa1a45..2d4330b69781 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16469,6 +16469,7 @@ let sha256 = "052i5c7cgvs5iv011dkq3r8d6jycg2gjjg3907ijsbdlq8q52vhs"; }; + patches = [ ../development/python-modules/sphinx-1.3.1-pr-1946.patch ]; LC_ALL = "en_US.UTF-8"; checkPhase = '' PYTHON=${python.executable} make test