* [gentoo-commits] repo/gentoo:master commit in: dev-python/docutils/files/
@ 2016-09-11 8:56 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2016-09-11 8:56 UTC (permalink / raw
To: gentoo-commits
commit: f28f92f152ea68df2f1686a5891a88af62d85247
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Sep 10 17:08:32 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 08:48:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f28f92f1
dev-python/docutils: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/2291
Signed-off-by: David Seifert <soap <AT> gentoo.org>
| 24 -------
.../docutils/files/docutils-0.7-encoding.patch | 83 ----------------------
.../docutils-0.7-python-3.2-configparser.patch | 49 -------------
...tils-0.7-python-3.2-xml.etree.ElementTree.patch | 16 -----
4 files changed, 172 deletions(-)
diff --git a/dev-python/docutils/files/docutils-0.6-extra_modules.patch b/dev-python/docutils/files/docutils-0.6-extra_modules.patch
deleted file mode 100644
index ca5de4b..00000000
--- a/dev-python/docutils/files/docutils-0.6-extra_modules.patch
+++ /dev/null
@@ -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__' :
diff --git a/dev-python/docutils/files/docutils-0.7-encoding.patch b/dev-python/docutils/files/docutils-0.7-encoding.patch
deleted file mode 100644
index 9a88f9f..00000000
--- a/dev-python/docutils/files/docutils-0.7-encoding.patch
+++ /dev/null
@@ -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__":
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
deleted file mode 100644
index 4867e70..00000000
--- a/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch
+++ /dev/null
@@ -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
-
-
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
deleted file mode 100644
index 0e77f7e..00000000
--- a/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch
+++ /dev/null
@@ -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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/docutils/files/
@ 2020-06-02 4:28 Aaron Bauman
0 siblings, 0 replies; 2+ messages in thread
From: Aaron Bauman @ 2020-06-02 4:28 UTC (permalink / raw
To: gentoo-commits
commit: 35b797ac754acc1e937d67e50ad7e1771ea8c605
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue May 19 19:17:56 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Jun 2 04:27:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35b797ac
dev-python/docutils: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../docutils/files/docutils-0.15.2-tests.patch | 40 ----------------------
1 file changed, 40 deletions(-)
diff --git a/dev-python/docutils/files/docutils-0.15.2-tests.patch b/dev-python/docutils/files/docutils-0.15.2-tests.patch
deleted file mode 100644
index 11ccbd01b90..00000000000
--- a/dev-python/docutils/files/docutils-0.15.2-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ru docutils-0.15.2.orig/test/test_writers/test_odt.py docutils-0.15.2/test/test_writers/test_odt.py
---- docutils-0.15.2.orig/test/test_writers/test_odt.py 2019-11-25 19:38:23.327374852 -0800
-+++ docutils-0.15.2/test/test_writers/test_odt.py 2019-11-25 19:38:13.585433399 -0800
-@@ -38,6 +38,7 @@
-
- from __init__ import DocutilsTestSupport
-
-+import unittest
- import docutils
- import docutils.core
- from docutils._compat import BytesIO
-@@ -146,12 +147,13 @@
- # xxxx is replaced with a name for the new test.
- # See instructions above in module doc-string.
- #
--
-+ @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
- def test_odt_basic(self):
- self.process_test('odt_basic.txt', 'odt_basic.odt',
- save_output_name='odt_basic.odt'
- )
-
-+ @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
- def test_odt_nested_class(self):
- self.process_test('odt_nested_class.txt',
- 'odt_nested_class.odt',
-@@ -166,11 +168,13 @@
- save_output_name='odt_no_class.odt'
- )
-
-+ @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
- def test_odt_tables1(self):
- self.process_test('odt_tables1.txt', 'odt_tables1.odt',
- save_output_name='odt_tables1.odt'
- )
-
-+ @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
- def test_odt_custom_headfoot(self):
- settings_overrides = {
- 'custom_header': 'Page %p% of %P%',
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-02 4:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-11 8:56 [gentoo-commits] repo/gentoo:master commit in: dev-python/docutils/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2020-06-02 4:28 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox