diff options
| -rw-r--r-- | dev-python/zconfig/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/zconfig/files/zconfig-3.5.0-py38.patch | 105 | ||||
| -rw-r--r-- | dev-python/zconfig/zconfig-3.5.0.ebuild | 36 |
3 files changed, 0 insertions, 142 deletions
diff --git a/dev-python/zconfig/Manifest b/dev-python/zconfig/Manifest index 4d6e43cc55ea..abea87d5c765 100644 --- a/dev-python/zconfig/Manifest +++ b/dev-python/zconfig/Manifest @@ -1,2 +1 @@ -DIST ZConfig-3.5.0.tar.gz 127317 BLAKE2B 735d554072d4be4ee0552151a6bd0401e66bc0a7a091d97656a2c95efb13580d264a39e28c11e096ee77f57bc96d684720c22c981f5dbd82ce012d40c94d33ea SHA512 14af4de2adcb7e5404a4fd8e1a1903758c584898fda7c4d2a660616c37023f0e0b5d4acac789a930c2900eb501528899d51c4ea4c4050535cfbaa629e9159558 DIST ZConfig-3.6.0.tar.gz 134559 BLAKE2B cf24d055a88c552311e5837b0caba143a9d4122caa0319ad31de89177d521ecb3f8fb7f463618f35410cc25169865103ff5957e9484e347ebd7e1b7cacb20b35 SHA512 a5cca99f324007a14f4738be1c9f7424538d8a13f7171fbfa979ce9273b29679eb18b0e905afc96d38abcf042af222e3e86acad6912b9eb8b71b6c8122c47031 diff --git a/dev-python/zconfig/files/zconfig-3.5.0-py38.patch b/dev-python/zconfig/files/zconfig-3.5.0-py38.patch deleted file mode 100644 index ea5e8db7642b..000000000000 --- a/dev-python/zconfig/files/zconfig-3.5.0-py38.patch +++ /dev/null @@ -1,105 +0,0 @@ -Required for python 3.8+ compatibility -https://github.com/zopefoundation/ZConfig/pull/70 ---- a/ZConfig/components/logger/formatter.py -+++ b/ZConfig/components/logger/formatter.py -@@ -248,8 +248,17 @@ def __call__(self): - else: - # A formatter class that supports style, but our style is - # non-standard, so we reach under the covers a bit. -+ # -+ # Python 3.8 adds a validate option, defaulting to True, -+ # which cases the format string to be checked. Since -+ # safe-template is not a standard style, we want to -+ # suppress this. -+ # -+ kwargs = dict() -+ if sys.version_info >= (3, 8): -+ kwargs['validate'] = False - formatter = self.factory(self.format, self.dateformat, -- style='$') -+ style='$', **kwargs) - assert formatter._style._fmt == self.format - formatter._style = stylist - else: ---- a/ZConfig/components/logger/tests/test_formatter.py -+++ b/ZConfig/components/logger/tests/test_formatter.py -@@ -25,6 +25,17 @@ - import ZConfig.components.logger.tests.support - - -+# In Python 3.8, a KeyError raised by string interpolation is re-written -+# into a ValueError reporting a reference to an undefined field. We're -+# not masking the exception, but we want to check for the right one in -+# the tests below (without catching anything else). -+# -+if sys.version_info >= (3, 8): -+ MissingFieldError = ValueError -+else: -+ MissingFieldError = KeyError -+ -+ - class LogFormatStyleTestCase(unittest.TestCase): - - def setUp(self): -@@ -314,7 +325,10 @@ class CustomFormatterFactoryWithoutStyleParamTestCase( - class StylelessFormatter(logging.Formatter): - - def __init__(self, fmt=None, datefmt=None): -- logging.Formatter.__init__(self, fmt=fmt, datefmt=datefmt) -+ kwargs = dict() -+ if sys.version_info >= (3, 8): -+ kwargs['validate'] = False -+ logging.Formatter.__init__(self, fmt=fmt, datefmt=datefmt, **kwargs) - - - def styleless_formatter(fmt=None, datefmt=None): -@@ -552,9 +566,9 @@ def test_classic_arbitrary_field_missing(self): - arbitrary_fields=True) - - # The formatter still breaks when it references an undefined field: -- with self.assertRaises(KeyError) as cm: -+ with self.assertRaises(MissingFieldError) as cm: - formatter.format(self.record) -- self.assertEqual(str(cm.exception), "'undefined_field'") -+ self.assertIn("'undefined_field'", str(cm.exception)) - - def test_classic_arbitrary_field_present(self): - formatter = self.get_formatter( -@@ -574,9 +588,9 @@ def test_format_arbitrary_field_missing(self): - arbitrary_fields=True) - - # The formatter still breaks when it references an undefined field: -- with self.assertRaises(KeyError) as cm: -+ with self.assertRaises(MissingFieldError) as cm: - formatter.format(self.record) -- self.assertEqual(str(cm.exception), "'undefined_field'") -+ self.assertIn("'undefined_field'", str(cm.exception)) - - def test_format_arbitrary_field_present(self): - formatter = self.get_formatter( -@@ -596,9 +610,9 @@ def test_template_arbitrary_field_missing(self): - arbitrary_fields=True) - - # The formatter still breaks when it references an undefined field: -- with self.assertRaises(KeyError) as cm: -+ with self.assertRaises(MissingFieldError) as cm: - formatter.format(self.record) -- self.assertEqual(str(cm.exception), "'undefined_field'") -+ self.assertIn("'undefined_field'", str(cm.exception)) - - def test_template_arbitrary_field_present(self): - formatter = self.get_formatter( - ---- a/ZConfig/components/logger/formatter.py -+++ b/ZConfig/components/logger/formatter.py -@@ -250,7 +250,7 @@ def __call__(self): - # non-standard, so we reach under the covers a bit. - # - # Python 3.8 adds a validate option, defaulting to True, -- # which cases the format string to be checked. Since -+ # which causes the format string to be checked. Since - # safe-template is not a standard style, we want to - # suppress this. - # - - diff --git a/dev-python/zconfig/zconfig-3.5.0.ebuild b/dev-python/zconfig/zconfig-3.5.0.ebuild deleted file mode 100644 index 174067f20aaa..000000000000 --- a/dev-python/zconfig/zconfig-3.5.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_USE_SETUPTOOLS=rdepend -PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 - -MY_PN="ZConfig" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="A configuration library supporting a hierarchical schema-driven configuration model" -HOMEPAGE="https://pypi.org/project/ZConfig/" -S="${WORKDIR}/${MY_P}" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" - -LICENSE="ZPL" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND=" - test? ( - dev-python/docutils[${PYTHON_USEDEP}] - dev-python/manuel[${PYTHON_USEDEP}] - dev-python/zope-exceptions[${PYTHON_USEDEP}] - dev-python/zope-interface[${PYTHON_USEDEP}] - dev-python/zope-testrunner[${PYTHON_USEDEP}] - )" - -DOCS=( CHANGES.rst README.rst ) - -PATCHES=( "${FILESDIR}"/${P}-py38.patch ) - -distutils_enable_tests nose -distutils_enable_sphinx doc dev-python/sphinxcontrib-programoutput |