gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-07-28 09:58:08 -07:00
Code Issues Projects Releases Wiki Activity

dev-python/docutils: remove unused patches

Browse Source 
Closes: https://github.com/gentoo/gentoo/pull/2291

Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger (asterix)
2016-09-10 19:08:32 +02:00
committed by David Seifert
parent 31ce79f50d
commit f28f92f152
4 changed files with 0 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dev-python/docutils/files/docutils-0.6-extra_modules.patch
View File

@@ -1,24 +0,0 @@
--- setup.py
+++ setup.py
@@ -182,19 +182,8 @@
List of (module name, minimum __version__ string, [attribute names])."""
def get_extras():
- extras = []
- for module_name, version, attributes in extra_modules:
- try:
- module = __import__(module_name)
- if version and module.__version__ < version:
- raise ValueError
- for attribute in attributes or []:
- getattr(module, attribute)
- print ('"%s" module already present; ignoring extras/%s.py.'
- % (module_name, module_name))
- except (ImportError, AttributeError, ValueError):
- extras.append(module_name)
- return extras
+ # Old method does not work for upgrading/downgrading docutils.
+ return ["roman"]
if __name__ == '__main__' :

83
dev-python/docutils/files/docutils-0.7-encoding.patch
View File

@@ -1,83 +0,0 @@
--- docutils/nodes.py
+++ docutils/nodes.py
@@ -27,6 +27,7 @@
import warnings
import types
import unicodedata
+import locale
# ==============================
# Functional Node Base Classes
@@ -328,6 +329,9 @@
else:
def __new__(cls, data, rawsource=None):
"""Prevent the rawsource argument from propagating to str."""
+ encoding = locale.getdefaultlocale()[1]
+ if isinstance(data, str) and encoding is not None:
+ data = data.decode(encoding)
return reprunicode.__new__(cls, data)
def __init__(self, data, rawsource=''):
--- docutils/parsers/rst/directives/misc.py
+++ docutils/parsers/rst/directives/misc.py
@@ -10,6 +10,7 @@
import os.path
import re
import time
+import locale
from docutils import io, nodes, statemachine, utils
from docutils.parsers.rst import Directive, convert_directive_function
from docutils.parsers.rst import directives, roles, states
@@ -66,8 +67,16 @@
input_encoding_error_handler),
handle_io_errors=None)
except IOError, error:
- raise self.severe('Problems with "%s" directive path:\n%s: %s.' %
- (self.name, error.__class__.__name__, str(error)))
+ if sys.version_info < (3,):
+ error_string = str(error)
+ encoding = locale.getdefaultlocale()[1]
+ if encoding is not None:
+ error_string = error_string.decode(encoding)
+ raise self.severe(u'Problems with "%s" directive path:\n%s: %s.' %
+ (self.name, error.__class__.__name__, error_string))
+ else:
+ raise self.severe('Problems with "%s" directive path:\n%s: %s.' %
+ (self.name, error.__class__.__name__, str(error)))
# Hack: Since Python 2.6, the string interpolation returns a
# unicode object if one of the supplied %s replacements is a
# unicode object. IOError has no `__unicode__` method and the
--- tools/buildhtml.py
+++ tools/buildhtml.py
@@ -15,8 +15,8 @@
__docformat__ = 'reStructuredText'
+import locale
try:
- import locale
locale.setlocale(locale.LC_ALL, '')
except:
pass
@@ -236,8 +236,19 @@
writer_name=pub_struct.writer_name,
settings=settings)
except ApplicationError, error:
- print >>sys.stderr, (' Error (%s): %s'
- % (error.__class__.__name__, error))
+ if sys.version_info < (3,):
+ encoding = locale.getdefaultlocale()[1]
+ if isinstance(error.message, unicode) and encoding is not None:
+ error_message = (u' Error (%s): %s'
+ % (error.__class__.__name__, error))
+ error_message = error_message.encode(encoding)
+ else:
+ error_message = (' Error (%s): %s'
+ % (error.__class__.__name__, error))
+ print >>sys.stderr, error_message
+ else:
+ print >>sys.stderr, (' Error (%s): %s'
+ % (error.__class__.__name__, error))
if __name__ == "__main__":

49
dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch
View File

@@ -1,49 +0,0 @@
https://sourceforge.net/tracker/?func=detail&atid=422030&aid=3149845&group_id=38414
--- docutils/frontend.py
+++ docutils/frontend.py
@@ -671,7 +671,7 @@
raise KeyError('No option with dest == %r.' % dest)
-class ConfigParser(CP.ConfigParser):
+class ConfigParser(CP.RawConfigParser):
old_settings = {
'pep_stylesheet': ('pep_html writer', 'stylesheet'),
@@ -693,7 +693,7 @@
"""
def __init__(self, *args, **kwargs):
- CP.ConfigParser.__init__(self, *args, **kwargs)
+ CP.RawConfigParser.__init__(self, *args, **kwargs)
self._files = []
"""List of paths of configuration files read."""
@@ -708,7 +708,7 @@
except IOError:
continue
try:
- CP.ConfigParser.readfp(self, fp, filename)
+ CP.RawConfigParser.readfp(self, fp, filename)
except UnicodeDecodeError:
sys.stderr.write(self.not_utf8_error % (filename, filename))
fp.close()
@@ -749,7 +749,7 @@
except KeyError:
continue
if option.validator:
- value = self.get(section, setting, raw=1)
+ value = self.get(section, setting)
try:
new_value = option.validator(
setting, value, option_parser,
@@ -778,7 +778,7 @@
section_dict = {}
if self.has_section(section):
for option in self.options(section):
- section_dict[option] = self.get(section, option, raw=1)
+ section_dict[option] = self.get(section, option)
return section_dict

16
dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch
View File

@@ -1,16 +0,0 @@
http://svn.berlios.de/viewvc/docutils?view=revision&revision=7013
--- docutils/writers/odf_odt/__init__.py
+++ docutils/writers/odf_odt/__init__.py
@@ -300,7 +300,10 @@
def ToString(et):
outstream = StringIO.StringIO()
- et.write(outstream)
+ if sys.version_info >= (3, 2):
+ et.write(outstream, encoding="unicode")
+ else:
+ et.write(outstream)
s1 = outstream.getvalue()
outstream.close()
return s1