diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/docutils/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/docutils/files')
6 files changed, 236 insertions, 0 deletions
diff --git a/dev-python/docutils/files/docutils-0.10-optparser.patch b/dev-python/docutils/files/docutils-0.10-optparser.patch new file mode 100644 index 000000000000..a65fbde71ce0 --- /dev/null +++ b/dev-python/docutils/files/docutils-0.10-optparser.patch @@ -0,0 +1,34 @@ +Patch by Arfrever +http://sourceforge.net/tracker/?func=detail&aid=3598893&group_id=38414&atid=422030 + +Index: docutils/frontend.py +=================================================================== +--- docutils/frontend.py (revision 7578) ++++ docutils/frontend.py (working copy) +@@ -158,7 +158,7 @@ + + def validate_colon_separated_string_list( + setting, value, option_parser, config_parser=None, config_section=None): +- if isinstance(value, unicode): ++ if isinstance(value, basestring): + value = value.split(':') + else: + last = value.pop() +@@ -171,7 +171,7 @@ + """ + # `value` is already a list when given as command line option + # and "action" is "append" +- if isinstance(value, unicode): ++ if isinstance(value, basestring): + value = [value] + # this function is called for every option added to `value` + # -> split the last item and apped the result: +@@ -731,7 +731,7 @@ + """Wrapper around sys.stderr catching en-/decoding errors""" + + def read(self, filenames, option_parser): +- if type(filenames) in (str, unicode): ++ if isinstance(filenames, basestring): + filenames = [filenames] + for filename in filenames: + try: diff --git a/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch b/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch new file mode 100644 index 000000000000..e84256f3dc43 --- /dev/null +++ b/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch @@ -0,0 +1,30 @@ +--- a/docutils/writers/odf_odt/__init__.py ++++ b/docutils/writers/odf_odt/__init__.py +@@ -88,16 +88,20 @@ + # that support for the ability to get the parent of an element. + # + if WhichElementTree == 'elementtree': +- class _ElementInterfaceWrapper(etree._ElementInterface): ++ import weakref ++ _parents = weakref.WeakKeyDictionary() ++ if isinstance(etree.Element, type): ++ _ElementInterface = etree.Element ++ else: ++ _ElementInterface = etree._ElementInterface ++ class _ElementInterfaceWrapper(_ElementInterface): + def __init__(self, tag, attrib=None): +- etree._ElementInterface.__init__(self, tag, attrib) +- if attrib is None: +- attrib = {} +- self.parent = None ++ _ElementInterface.__init__(self, tag, attrib) ++ _parents[self] = None + def setparent(self, parent): +- self.parent = parent ++ _parents[self] = parent + def getparent(self): +- return self.parent ++ return _parents[self] + + + # diff --git a/dev-python/docutils/files/docutils-0.6-extra_modules.patch b/dev-python/docutils/files/docutils-0.6-extra_modules.patch new file mode 100644 index 000000000000..ca5de4b7fc4e --- /dev/null +++ b/dev-python/docutils/files/docutils-0.6-extra_modules.patch @@ -0,0 +1,24 @@ +--- 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__' : diff --git a/dev-python/docutils/files/docutils-0.7-encoding.patch b/dev-python/docutils/files/docutils-0.7-encoding.patch new file mode 100644 index 000000000000..9a88f9fedaa6 --- /dev/null +++ b/dev-python/docutils/files/docutils-0.7-encoding.patch @@ -0,0 +1,83 @@ +--- 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__": diff --git a/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch b/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch new file mode 100644 index 000000000000..3f67f244cfd1 --- /dev/null +++ b/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch @@ -0,0 +1,49 @@ +http://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 + + diff --git a/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch b/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch new file mode 100644 index 000000000000..0e77f7e974a8 --- /dev/null +++ b/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch @@ -0,0 +1,16 @@ +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 |
