diff --git a/python-calmjs.changes b/python-calmjs.changes index 83042a2..2a21148 100644 --- a/python-calmjs.changes +++ b/python-calmjs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 7 03:37:22 UTC 2025 - Steve Kowalik + +- Rejig patch support-python-313.patch to also cope with other argparse + changes. + ------------------------------------------------------------------- Mon Dec 9 03:34:48 UTC 2024 - Steve Kowalik diff --git a/python-calmjs.spec b/python-calmjs.spec index 151c6f4..3f9e00e 100644 --- a/python-calmjs.spec +++ b/python-calmjs.spec @@ -1,7 +1,7 @@ # # spec file for package python-calmjs # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/support-python-313.patch b/support-python-313.patch index e9e10ff..be0631a 100644 --- a/support-python-313.patch +++ b/support-python-313.patch @@ -40,3 +40,15 @@ Index: calmjs-3.4.4/src/calmjs/tests/test_argparse.py class ArgumentParserTestCase(unittest.TestCase): +@@ -306,7 +315,10 @@ class StoreCommaDelimitedListTestCase(un + with self.assertRaises(SystemExit): + argparser.parse_known_args(['-p', '3,2,1,0']) + +- self.assertIn("(choose from '1', '2', '3')", sys.stderr.getvalue()) ++ msg = "(choose from '1', '2', '3')" ++ if sys.version_info[:2] == (3, 12): ++ msg = "(choose from 1, 2, 3)" ++ self.assertIn(msg, sys.stderr.getvalue()) + + with self.assertRaises(SystemExit): + argparser.parse_known_args(['-p', '0'])