dev-python/sphinx: Clean old versions up

This commit is contained in:
Michał Górny
2017-05-03 12:16:29 +02:00
parent 47a790da66
commit e8990b7ce9
5 changed files with 0 additions and 323 deletions

View File

@@ -1,35 +0,0 @@
# HG changeset patch
# User Georg Brandl <georg@python.org>
# Date 1351590528 -3600
# Node ID ffb145b7884fc926d6a68f4aaeede1d4964f727c
# Parent 2c107bc997e8817c451ba24089766eefb6e60fc3
Closes #998: fix manpage writer in expectation of docutils 0.10 API change
diff --git a/sphinx/writers/manpage.py b/sphinx/writers/manpage.py
--- a/sphinx/writers/manpage.py
+++ b/sphinx/writers/manpage.py
@@ -72,6 +72,11 @@
# since self.append_header() is never called, need to do this here
self.body.append(MACRO_DEF)
+ # Overwrite admonition label translations with our own
+ for label, translation in admonitionlabels.items():
+ self.language.labels[label] = self.deunicode(translation)
+
+
# overwritten -- added quotes around all .TH arguments
def header(self):
tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\""
@@ -193,12 +198,6 @@
def depart_seealso(self, node):
self.depart_admonition(node)
- # overwritten -- use our own label translations
- def visit_admonition(self, node, name=None):
- if name:
- self.body.append('.IP %s\n' %
- self.deunicode(admonitionlabels.get(name, name)))
-
def visit_productionlist(self, node):
self.ensure_eol()
names = []

View File

@@ -1,45 +0,0 @@
# HG changeset patch
# User Rob Reilink <r.reilink@science-applied.nl>
# Date 1331657734 -3600
# Node ID 8aba132b1337fc351fe1464f3a4b61f21f55e64e
# Parent 4a6d33249418befdf587603fc31db58fb863fee4
fixed encoding for hashing functions for Python 3
diff -r 4a6d33249418befdf587603fc31db58fb863fee4 -r 8aba132b1337fc351fe1464f3a4b61f21f55e64e sphinx/ext/graphviz.py
--- a/sphinx/ext/graphviz.py Sat Mar 10 22:24:59 2012 +0100
+++ b/sphinx/ext/graphviz.py Tue Mar 13 17:55:34 2012 +0100
@@ -121,9 +121,11 @@
def render_dot(self, code, options, format, prefix='graphviz'):
"""Render graphviz code into a PNG or PDF output file."""
- hashkey = code.encode('utf-8') + str(options) + \
+ hashkey = (code + str(options) + \
str(self.builder.config.graphviz_dot) + \
str(self.builder.config.graphviz_dot_args)
+ ).encode('utf-8')
+
fname = '%s-%s.%s' % (prefix, sha(hashkey).hexdigest(), format)
if hasattr(self.builder, 'imgpath'):
# HTML
diff -r 4a6d33249418befdf587603fc31db58fb863fee4 -r 8aba132b1337fc351fe1464f3a4b61f21f55e64e sphinx/ext/inheritance_diagram.py
--- a/sphinx/ext/inheritance_diagram.py Sat Mar 10 22:24:59 2012 +0100
+++ b/sphinx/ext/inheritance_diagram.py Tue Mar 13 17:55:34 2012 +0100
@@ -39,7 +39,7 @@
import re
import sys
import inspect
-import __builtin__
+import __builtin__ as __builtin__ # as __builtin__ is for lib2to3 compatibility
try:
from hashlib import md5
except ImportError:
@@ -314,7 +314,8 @@
def get_graph_hash(node):
- return md5(node['content'] + str(node['parts'])).hexdigest()[-10:]
+ encoded = (node['content'] + str(node['parts'])).encode('utf-8')
+ return md5(encoded).hexdigest()[-10:]
def html_visit_inheritance_diagram(self, node):