Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-Genshi for openSUSE:Factory checked in at 2024-07-24 15:33:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Genshi (Old) and /work/SRC/openSUSE:Factory/.python-Genshi.new.1869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Genshi" Wed Jul 24 15:33:02 2024 rev:25 rq:1189025 version:0.7.9 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Genshi/python-Genshi.changes 2023-04-24 22:30:50.939380725 +0200 +++ /work/SRC/openSUSE:Factory/.python-Genshi.new.1869/python-Genshi.changes 2024-07-25 12:03:10.164168269 +0200 @@ -1,0 +2,16 @@ +Mon Jul 22 09:59:24 UTC 2024 - John Paul Adrian Glaubitz <[email protected]> + +- Update to 0.7.9 + * Add Python 3.12 to CI matrix and fix Python 3.12 support. (#77) + * Add Python 3.13 beta to CI. (#81) + * Add badges to the README. (#82) +- from version 0.7.8 + * Do not merge sub directives if they have not been changed. (#53) + * Silence deprecation warnings from attempting to import Ellipsis and + Str (which are needed to support older Pythons). (#73) + * Remove fallback to distutils, patching of bdist_egg and use of doctools. (#74) + * Clarify the escaping in _URL_FINDER. (#76) + * Fix installation with setuptools >= 60. (#68) +- Rename README.txt to README.md in %files section + +------------------------------------------------------------------- Old: ---- Genshi-0.7.7.tar.gz New: ---- Genshi-0.7.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Genshi.spec ++++++ --- /var/tmp/diff_new_pack.zeaILu/_old 2024-07-25 12:03:10.592185529 +0200 +++ /var/tmp/diff_new_pack.zeaILu/_new 2024-07-25 12:03:10.596185690 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-Genshi # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define oldpython python %{?sle15_python_module_pythons} Name: python-Genshi -Version: 0.7.7 +Version: 0.7.9 Release: 0 Summary: A toolkit for generation of output for the web License: BSD-3-Clause @@ -87,7 +87,7 @@ %files %{python_files} %license COPYING -%doc ChangeLog README.txt +%doc ChangeLog README.md %{python_sitearch}/genshi/ %{python_sitearch}/Genshi-%{version}*-info %if 0%{?suse_version} > 1500 ++++++ Genshi-0.7.7.tar.gz -> Genshi-0.7.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/ChangeLog new/Genshi-0.7.9/ChangeLog --- old/Genshi-0.7.7/ChangeLog 2022-04-21 14:27:35.000000000 +0200 +++ new/Genshi-0.7.9/ChangeLog 2024-06-16 01:52:43.000000000 +0200 @@ -1,3 +1,26 @@ +Version 0.7.9 +https://github.com/edgewall/genshi/releases/tag/0.7.9 +(Jun 16 2024, from branches/stable/0.7.x) + +* Add Python 3.12 to CI matrix and fix Python 3.12 support. (#77 by Simon Cross) +* Add Python 3.13 beta to CI. (#81 by Simon Cross) +* Add badges to the README. (#82 by Simon Cross) + + +Version 0.7.8 +https://github.com/edgewall/genshi/releases/tag/0.7.8 +(Jun 14 2024, from branches/stable/0.7.x) + +* Do not merge sub directives if they have not been changed. + (#53 by Cédric Krier) +* Silence deprecation warnings from attempting to import Ellipsis and + Str (which are needed to support older Pythons). (#73 by Cédric Krier) +* Remove fallback to distutils, patching of bdist_egg and use of doctools. + (#74 by Simon Cross) +* Clarify the escaping in _URL_FINDER. (#76 by Simon Cross) +* Fix installation with setuptools >= 60. (#68 by Graham Inggs) + + Version 0.7.7 https://github.com/edgewall/genshi/releases/tag/0.7.7 (Apr 21 2022, from branches/stable/0.7.x) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/Genshi.egg-info/PKG-INFO new/Genshi-0.7.9/Genshi.egg-info/PKG-INFO --- old/Genshi-0.7.7/Genshi.egg-info/PKG-INFO 2022-04-21 14:27:45.000000000 +0200 +++ new/Genshi-0.7.9/Genshi.egg-info/PKG-INFO 2024-06-16 01:52:56.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: Genshi -Version: 0.7.7 +Version: 0.7.9 Summary: A toolkit for generation of output for the web Home-page: https://github.com/edgewall/genshi Author: Edgewall Software @@ -16,6 +16,8 @@ Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: Implementation :: CPython +Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content Classifier: Topic :: Software Development :: Libraries :: Python Modules Classifier: Topic :: Text Processing :: Markup :: HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/Genshi.egg-info/SOURCES.txt new/Genshi-0.7.9/Genshi.egg-info/SOURCES.txt --- old/Genshi-0.7.7/Genshi.egg-info/SOURCES.txt 2022-04-21 14:27:45.000000000 +0200 +++ new/Genshi-0.7.9/Genshi.egg-info/SOURCES.txt 2024-06-16 01:52:56.000000000 +0200 @@ -1,7 +1,7 @@ COPYING ChangeLog MANIFEST.in -README.txt +README.md pyproject.toml setup.cfg setup.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/PKG-INFO new/Genshi-0.7.9/PKG-INFO --- old/Genshi-0.7.7/PKG-INFO 2022-04-21 14:27:45.000000000 +0200 +++ new/Genshi-0.7.9/PKG-INFO 2024-06-16 01:52:56.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: Genshi -Version: 0.7.7 +Version: 0.7.9 Summary: A toolkit for generation of output for the web Home-page: https://github.com/edgewall/genshi Author: Edgewall Software @@ -16,6 +16,8 @@ Classifier: Programming Language :: Python Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 3 +Classifier: Programming Language :: Python :: Implementation :: CPython +Classifier: Programming Language :: Python :: Implementation :: PyPy Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content Classifier: Topic :: Software Development :: Libraries :: Python Modules Classifier: Topic :: Text Processing :: Markup :: HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/README.md new/Genshi-0.7.9/README.md --- old/Genshi-0.7.7/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/Genshi-0.7.9/README.md 2024-06-16 01:52:43.000000000 +0200 @@ -0,0 +1,24 @@ +About Genshi +============ + +<!-- badges-start --> + +[](https://genshi.readthedocs.org/) +[](https://github.com/edgewall/genshi/actions/workflows/tests.yml) +[](https://pypi.org/project/genshi/) +[](https://pypi.org/project/genshi/) +[](https://pypi.org/project/genshi/) + +<!-- badges-end --> + +Genshi is a Python library that provides an integrated set of +components for parsing, generating, and processing HTML, XML or other +textual content for output generation on the web. The major feature is +a template language, which is heavily inspired by Kid. + +For more information please see: + +- [ReadTheDocs](https://genshi.readthedocs.org/) +- [https://genshi.edgewall.org/](https://genshi.edgewall.org/) +- the documentation in the `doc` directory. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/README.txt new/Genshi-0.7.9/README.txt --- old/Genshi-0.7.7/README.txt 2022-04-21 14:27:35.000000000 +0200 +++ new/Genshi-0.7.9/README.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,12 +0,0 @@ -About Genshi -============ - -Genshi is a Python library that provides an integrated set of -components for parsing, generating, and processing HTML, XML or other -textual content for output generation on the web. The major feature is -a template language, which is heavily inspired by Kid. - -For more information please see the documentation in the `doc` -directory, and visit the Genshi web site: - - <http://genshi.edgewall.org/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/__init__.py new/Genshi-0.7.9/genshi/__init__.py --- old/Genshi-0.7.7/genshi/__init__.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/__init__.py 2024-06-16 01:52:43.000000000 +0200 @@ -20,7 +20,7 @@ """ __docformat__ = 'restructuredtext en' -__version__ = '0.7.7' +__version__ = '0.7.9' from genshi.core import * from genshi.input import ParseError, XML, HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/compat.py new/Genshi-0.7.9/genshi/compat.py --- old/Genshi-0.7.7/genshi/compat.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/compat.py 2024-06-16 01:52:43.000000000 +0200 @@ -20,6 +20,7 @@ except ImportError: import _ast as ast import sys +import warnings from types import CodeType import six @@ -137,13 +138,18 @@ # In Python 3.8, Str and Ellipsis was replaced by Constant -try: - _ast_Ellipsis = ast.Ellipsis - _ast_Str = ast.Str - _ast_Str_value = lambda obj: obj.s -except AttributeError: - _ast_Ellipsis = _ast_Str = ast.Constant - _ast_Str_value = lambda obj: obj.value +with warnings.catch_warnings(): + warnings.filterwarnings('error', category=DeprecationWarning) + try: + _ast_Ellipsis = ast.Ellipsis + _ast_Ellipsis_value = lambda obj: Ellipsis + _ast_Str = ast.Str + _ast_Str_value = lambda obj: obj.s + except (AttributeError, DeprecationWarning): + _ast_Ellipsis = ast.Constant + _ast_Ellipsis_value = lambda obj: obj.value + _ast_Str = ast.Constant + _ast_Str_value = lambda obj: obj.value class _DummyASTItem(object): pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/filters/html.py new/Genshi-0.7.9/genshi/filters/html.py --- old/Genshi-0.7.7/genshi/filters/html.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/filters/html.py 2024-06-16 01:52:43.000000000 +0200 @@ -354,7 +354,7 @@ # IE6 <http://openmya.hacker.jp/hasegawa/security/expression.txt> # 7) Particular bit of Unicode characters _URL_FINDITER = re.compile( - u'[Uu][Rr\u0280][Ll\u029F]%s*\(([^)]+)' % (r'\s')).finditer + u'[Uu][Rr\u0280][Ll\u029F]%s*\\(([^)]+)' % (r'\s')).finditer def __call__(self, stream): """Apply the filter to the given stream. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/filters/tests/i18n.py new/Genshi-0.7.9/genshi/filters/tests/i18n.py --- old/Genshi-0.7.7/genshi/filters/tests/i18n.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/filters/tests/i18n.py 2024-06-16 01:52:43.000000000 +0200 @@ -301,6 +301,19 @@ <span title="Voh">...</span> </html>""", tmpl.generate().render()) + def test_translate_nested_directives(self): + html = """<html xmlns:py="http://genshi.edgewall.org/";> + <py:with vars="x = 'test'"><py:if test="x"> + </py:if></py:with> + </html>""" + tmpl = MarkupTemplate(html) + raw = tmpl.generate().render() + tmpl = MarkupTemplate(html) + translator = Translator(DummyTranslations()) + translator.setup(tmpl) + translated = tmpl.generate().render() + self.assertEqual(raw, translated) + class MsgDirectiveTestCase(unittest.TestCase): @@ -2190,12 +2203,12 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest_suite(Translator.__module__)) - suite.addTest(unittest.makeSuite(TranslatorTestCase, 'test')) - suite.addTest(unittest.makeSuite(MsgDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(ChooseDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(DomainDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(ExtractTestCase, 'test')) - suite.addTest(unittest.makeSuite(ContextDirectiveTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TranslatorTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(MsgDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ChooseDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(DomainDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ExtractTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ContextDirectiveTestCase)) return suite if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/filters/tests/test_html.py new/Genshi-0.7.9/genshi/filters/tests/test_html.py --- old/Genshi-0.7.7/genshi/filters/tests/test_html.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/filters/tests/test_html.py 2024-06-16 01:52:43.000000000 +0200 @@ -614,8 +614,8 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest_suite(HTMLFormFiller.__module__)) - suite.addTest(unittest.makeSuite(HTMLFormFillerTestCase, 'test')) - suite.addTest(unittest.makeSuite(HTMLSanitizerTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(HTMLFormFillerTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(HTMLSanitizerTestCase)) return suite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/filters/tests/transform.py new/Genshi-0.7.9/genshi/filters/tests/transform.py --- old/Genshi-0.7.7/genshi/filters/tests/transform.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/filters/tests/transform.py 2024-06-16 01:52:43.000000000 +0200 @@ -1492,7 +1492,7 @@ EmptyTest, RemoveTest, UnwrapText, WrapTest, FilterTest, MapTest, SubstituteTest, RenameTest, ReplaceTest, BeforeTest, AfterTest, PrependTest, AppendTest, AttrTest, CopyTest, CutTest): - suite.addTest(unittest.makeSuite(test, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(test)) suite.addTest(doctest_suite( genshi.filters.transform, optionflags=doctest.NORMALIZE_WHITESPACE, extraglobs={'HTML': HTML, 'tag': tag, 'Markup': Markup})) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/template/astutil.py new/Genshi-0.7.9/genshi/template/astutil.py --- old/Genshi-0.7.7/genshi/template/astutil.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/template/astutil.py 2024-06-16 01:52:43.000000000 +0200 @@ -14,7 +14,7 @@ """Support classes for generating code from abstract syntax trees.""" from genshi.compat import ast as _ast, _ast_Constant, IS_PYTHON2, isstring, \ - _ast_Ellipsis + _ast_Ellipsis, _ast_Ellipsis_value __docformat__ = 'restructuredtext en' @@ -721,7 +721,10 @@ self.visit(node.value) self._write('[') def _process_slice(node): - if isinstance(node, _ast_Ellipsis): + if ( + isinstance(node, _ast_Ellipsis) + and _ast_Ellipsis_value(node) == Ellipsis + ): self._write('...') elif isinstance(node, _ast.Slice): if getattr(node, 'lower', 'None'): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/template/markup.py new/Genshi-0.7.9/genshi/template/markup.py --- old/Genshi-0.7.7/genshi/template/markup.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/template/markup.py 2024-06-16 01:52:43.000000000 +0200 @@ -172,11 +172,14 @@ ] elif kind is SUB: - directives, substream = data - substream = self._extract_directives(substream, namespace, + directives, prev_substream = data + substream = self._extract_directives(prev_substream, namespace, factory) - if len(substream) == 1 and substream[0][0] is SUB: + if (len(substream) == 1 and substream[0][0] is SUB + # merge only if the direct substream has changed + and (prev_substream[0][0] is not SUB + or prev_substream[0][1][0] != substream[0][1][0])): added_directives, substream = substream[0][1] directives += added_directives diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/template/tests/base.py new/Genshi-0.7.9/genshi/template/tests/base.py --- old/Genshi-0.7.7/genshi/template/tests/base.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/template/tests/base.py 2024-06-16 01:52:43.000000000 +0200 @@ -35,7 +35,7 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest.DocTestSuite(Template.__module__)) - suite.addTest(unittest.makeSuite(ContextTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ContextTestCase)) return suite if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/template/tests/directives.py new/Genshi-0.7.9/genshi/template/tests/directives.py --- old/Genshi-0.7.7/genshi/template/tests/directives.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/template/tests/directives.py 2024-06-16 01:52:43.000000000 +0200 @@ -1217,16 +1217,16 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest.DocTestSuite(directives)) - suite.addTest(unittest.makeSuite(AttrsDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(ChooseDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(DefDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(ForDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(IfDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(MatchDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(ContentDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(ReplaceDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(StripDirectiveTestCase, 'test')) - suite.addTest(unittest.makeSuite(WithDirectiveTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(AttrsDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ChooseDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(DefDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ForDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(IfDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(MatchDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ContentDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ReplaceDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(StripDirectiveTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(WithDirectiveTestCase)) return suite if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/template/tests/eval.py new/Genshi-0.7.9/genshi/template/tests/eval.py --- old/Genshi-0.7.7/genshi/template/tests/eval.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/template/tests/eval.py 2024-06-16 01:52:43.000000000 +0200 @@ -1037,8 +1037,8 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest.DocTestSuite(Expression.__module__)) - suite.addTest(unittest.makeSuite(ExpressionTestCase, 'test')) - suite.addTest(unittest.makeSuite(SuiteTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ExpressionTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(SuiteTestCase)) return suite if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/template/tests/interpolation.py new/Genshi-0.7.9/genshi/template/tests/interpolation.py --- old/Genshi-0.7.7/genshi/template/tests/interpolation.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/template/tests/interpolation.py 2024-06-16 01:52:43.000000000 +0200 @@ -195,7 +195,7 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest.DocTestSuite(interpolate.__module__)) - suite.addTest(unittest.makeSuite(InterpolateTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(InterpolateTestCase)) return suite if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/template/tests/loader.py new/Genshi-0.7.9/genshi/template/tests/loader.py --- old/Genshi-0.7.7/genshi/template/tests/loader.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/template/tests/loader.py 2024-06-16 01:52:43.000000000 +0200 @@ -522,7 +522,7 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest.DocTestSuite(TemplateLoader.__module__)) - suite.addTest(unittest.makeSuite(TemplateLoaderTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TemplateLoaderTestCase)) return suite if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/template/tests/markup.py new/Genshi-0.7.9/genshi/template/tests/markup.py --- old/Genshi-0.7.7/genshi/template/tests/markup.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/template/tests/markup.py 2024-06-16 01:52:43.000000000 +0200 @@ -802,7 +802,7 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest.DocTestSuite(MarkupTemplate.__module__)) - suite.addTest(unittest.makeSuite(MarkupTemplateTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(MarkupTemplateTestCase)) return suite if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/template/tests/plugin.py new/Genshi-0.7.9/genshi/template/tests/plugin.py --- old/Genshi-0.7.7/genshi/template/tests/plugin.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/template/tests/plugin.py 2024-06-16 01:52:43.000000000 +0200 @@ -256,8 +256,8 @@ def suite(): suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(MarkupTemplateEnginePluginTestCase, 'test')) - suite.addTest(unittest.makeSuite(TextTemplateEnginePluginTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(MarkupTemplateEnginePluginTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(TextTemplateEnginePluginTestCase)) return suite if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/template/tests/text.py new/Genshi-0.7.9/genshi/template/tests/text.py --- old/Genshi-0.7.7/genshi/template/tests/text.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/template/tests/text.py 2024-06-16 01:52:43.000000000 +0200 @@ -295,8 +295,8 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest.DocTestSuite(NewTextTemplate.__module__)) - suite.addTest(unittest.makeSuite(OldTextTemplateTestCase, 'test')) - suite.addTest(unittest.makeSuite(NewTextTemplateTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(OldTextTemplateTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(NewTextTemplateTestCase)) return suite if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/tests/builder.py new/Genshi-0.7.9/genshi/tests/builder.py --- old/Genshi-0.7.7/genshi/tests/builder.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/tests/builder.py 2024-06-16 01:52:43.000000000 +0200 @@ -67,7 +67,7 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest.DocTestSuite(Element.__module__)) - suite.addTest(unittest.makeSuite(ElementFactoryTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(ElementFactoryTestCase)) return suite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/tests/core.py new/Genshi-0.7.9/genshi/tests/core.py --- old/Genshi-0.7.7/genshi/tests/core.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/tests/core.py 2024-06-16 01:52:43.000000000 +0200 @@ -256,11 +256,11 @@ def suite(): suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(StreamTestCase, 'test')) - suite.addTest(unittest.makeSuite(MarkupTestCase, 'test')) - suite.addTest(unittest.makeSuite(NamespaceTestCase, 'test')) - suite.addTest(unittest.makeSuite(AttrsTestCase, 'test')) - suite.addTest(unittest.makeSuite(QNameTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(StreamTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(MarkupTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(NamespaceTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(AttrsTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(QNameTestCase)) suite.addTest(doctest_suite(core)) return suite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/tests/input.py new/Genshi-0.7.9/genshi/tests/input.py --- old/Genshi-0.7.7/genshi/tests/input.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/tests/input.py 2024-06-16 01:52:43.000000000 +0200 @@ -297,8 +297,8 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest_suite(XMLParser.__module__)) - suite.addTest(unittest.makeSuite(XMLParserTestCase, 'test')) - suite.addTest(unittest.makeSuite(HTMLParserTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(XMLParserTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(HTMLParserTestCase)) return suite if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/tests/output.py new/Genshi-0.7.9/genshi/tests/output.py --- old/Genshi-0.7.7/genshi/tests/output.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/tests/output.py 2024-06-16 01:52:43.000000000 +0200 @@ -469,10 +469,10 @@ def suite(): suite = unittest.TestSuite() - suite.addTest(unittest.makeSuite(XMLSerializerTestCase, 'test')) - suite.addTest(unittest.makeSuite(XHTMLSerializerTestCase, 'test')) - suite.addTest(unittest.makeSuite(HTMLSerializerTestCase, 'test')) - suite.addTest(unittest.makeSuite(EmptyTagFilterTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(XMLSerializerTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(XHTMLSerializerTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(HTMLSerializerTestCase)) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(EmptyTagFilterTestCase)) suite.addTest(doctest_suite(XMLSerializer.__module__)) return suite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/tests/path.py new/Genshi-0.7.9/genshi/tests/path.py --- old/Genshi-0.7.7/genshi/tests/path.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/tests/path.py 2024-06-16 01:52:43.000000000 +0200 @@ -709,7 +709,7 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest_suite(Path.__module__)) - suite.addTest(unittest.makeSuite(PathTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(PathTestCase)) return suite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/genshi/tests/util.py new/Genshi-0.7.9/genshi/tests/util.py --- old/Genshi-0.7.7/genshi/tests/util.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/genshi/tests/util.py 2024-06-16 01:52:43.000000000 +0200 @@ -87,7 +87,7 @@ def suite(): suite = unittest.TestSuite() suite.addTest(doctest_suite(util)) - suite.addTest(unittest.makeSuite(LRUCacheTestCase, 'test')) + suite.addTest(unittest.defaultTestLoader.loadTestsFromTestCase(LRUCacheTestCase)) return suite if __name__ == '__main__': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/setup.cfg new/Genshi-0.7.9/setup.cfg --- old/Genshi-0.7.7/setup.cfg 2022-04-21 14:27:45.000000000 +0200 +++ new/Genshi-0.7.9/setup.cfg 2024-06-16 01:52:56.000000000 +0200 @@ -1,6 +1,6 @@ [metadata] name = Genshi -version = 0.7.7 +version = 0.7.9 description = A toolkit for generation of output for the web long_description = Genshi is a Python library that provides an integrated set of @@ -21,6 +21,8 @@ Programming Language :: Python Programming Language :: Python :: 2 Programming Language :: Python :: 3 + Programming Language :: Python :: Implementation :: CPython + Programming Language :: Python :: Implementation :: PyPy Topic :: Internet :: WWW/HTTP :: Dynamic Content Topic :: Software Development :: Libraries :: Python Modules Topic :: Text Processing :: Markup :: HTML @@ -39,6 +41,8 @@ genshi.template.tests.templates install_requires = six +setup_requires = + setuptools [options.entry_points] babel.extractors = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Genshi-0.7.7/setup.py new/Genshi-0.7.9/setup.py --- old/Genshi-0.7.7/setup.py 2022-04-21 14:27:36.000000000 +0200 +++ new/Genshi-0.7.9/setup.py 2024-06-16 01:52:43.000000000 +0200 @@ -12,23 +12,12 @@ # individuals. For the exact contribution history, see the revision # history and logs, available at http://genshi.edgewall.org/log/. +import os +from setuptools import setup, Extension from distutils.command.build_ext import build_ext from distutils.errors import CCompilerError, DistutilsPlatformError -import os -try: - from setuptools import setup, Extension - from setuptools.command.bdist_egg import bdist_egg -except ImportError: - from distutils.core import setup, Extension - bdist_egg = None import sys -sys.path.append(os.path.join('doc', 'common')) -try: - from doctools import build_doc, test_doc -except ImportError: - build_doc = test_doc = None - _speedup_available = False is_pypy = hasattr(sys, 'pypy_version_info') @@ -75,19 +64,7 @@ if _speedup_enabled: ext_modules.append(Extension('genshi._speedups', ['genshi/_speedups.c'])) - -# Setuptools need some help figuring out if the egg is "zip_safe" or not -if bdist_egg: - class my_bdist_egg(bdist_egg): - def zip_safe(self): - return not _speedup_available and bdist_egg.zip_safe(self) - - -cmdclass = {'build_doc': build_doc, 'test_doc': test_doc, - 'build_ext': optional_build_ext} -if bdist_egg: - cmdclass['bdist_egg'] = my_bdist_egg - +cmdclass = {'build_ext': optional_build_ext} extra = {} if sys.version_info >= (3,):
