summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-21 01:40:55 +0100
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-21 04:11:05 +0100
commit67c487f243fd6ae6b734507a186104764b632211 (patch)
tree9c30091c6fcc6093df620c874ee8836bf30c464d /pkgs/development
parent313faf07ba17e275c0b534e54b3c2ebd267b85da (diff)
downloadnixpkgs-67c487f243fd6ae6b734507a186104764b632211.tar
nixpkgs-67c487f243fd6ae6b734507a186104764b632211.tar.gz
nixpkgs-67c487f243fd6ae6b734507a186104764b632211.tar.bz2
nixpkgs-67c487f243fd6ae6b734507a186104764b632211.tar.lz
nixpkgs-67c487f243fd6ae6b734507a186104764b632211.tar.xz
nixpkgs-67c487f243fd6ae6b734507a186104764b632211.tar.zst
nixpkgs-67c487f243fd6ae6b734507a186104764b632211.zip
pythonPackages.sphinx: 1.3.1 -> 1.3.4
Mainly bugfixes. Far too many to summarise here:
http://www.sphinx-doc.org/en/stable/changes.html#release-1-3-4-released-jan-12-2016
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch35
1 files changed, 0 insertions, 35 deletions
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
deleted file mode 100644
index 2933040141a..00000000000
--- a/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 7ce3b991229c74262f81ab7692a1dc6bde2416ee Mon Sep 17 00:00:00 2001
-From: Barry Warsaw <barry@python.org>
-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