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/docutils-0.7-encoding.patch | |
| 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/docutils-0.7-encoding.patch')
| -rw-r--r-- | dev-python/docutils/files/docutils-0.7-encoding.patch | 83 |
1 files changed, 83 insertions, 0 deletions
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__": |
