- Tweak support-python-313.patch to adapt to yet another change
in argparse OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-calmjs?expand=0&rev=24
This commit is contained in:
54
support-python-313.patch
Normal file
54
support-python-313.patch
Normal file
@@ -0,0 +1,54 @@
|
||||
Index: calmjs-3.4.4/src/calmjs/tests/test_argparse.py
|
||||
===================================================================
|
||||
--- calmjs-3.4.4.orig/src/calmjs/tests/test_argparse.py
|
||||
+++ calmjs-3.4.4/src/calmjs/tests/test_argparse.py
|
||||
@@ -112,7 +112,10 @@ class HelpFormatterTestCase(unittest.Tes
|
||||
for line in stream.getvalue().splitlines() if
|
||||
'--' in line
|
||||
]
|
||||
- self.assertEqual(options, ['-a', '-g', '-s', '-z'])
|
||||
+ expected = ['-a', '-g', '-s', '-z']
|
||||
+ if sys.version_info >= (3, 13):
|
||||
+ expected = [f"{x}," for x in expected]
|
||||
+ self.assertEqual(options, expected)
|
||||
|
||||
def test_sorted_case_insensitivity(self):
|
||||
parser = argparse.ArgumentParser(
|
||||
@@ -131,7 +134,10 @@ class HelpFormatterTestCase(unittest.Tes
|
||||
'--' in line
|
||||
]
|
||||
# the case is unspecified due to in-place sorting
|
||||
- self.assertEqual(options, ['-a', '-A', '-g', '-S', '-s', '-z'])
|
||||
+ expected = ['-a', '-A', '-g', '-S', '-s', '-z']
|
||||
+ if sys.version_info >= (3, 13):
|
||||
+ expected = [f"{x}," for x in expected]
|
||||
+ self.assertEqual(options, expected)
|
||||
|
||||
def test_sorted_simple_first(self):
|
||||
parser = argparse.ArgumentParser(
|
||||
@@ -150,8 +156,11 @@ class HelpFormatterTestCase(unittest.Tes
|
||||
'--' in line and '[' not in line
|
||||
]
|
||||
# the case is unspecified due to in-place sorting
|
||||
- self.assertEqual(options, [
|
||||
- '-a', '-A', '-z', '--goat', '--sheep', '--SNAKE'])
|
||||
+ long_options = ['--goat', '--sheep', '--SNAKE']
|
||||
+ expected = ['-a', '-A', '-z']
|
||||
+ if sys.version_info >= (3, 13):
|
||||
+ expected = [f"{x}," for x in expected]
|
||||
+ self.assertEqual(options, expected + long_options)
|
||||
|
||||
|
||||
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'])
|
||||
Reference in New Issue
Block a user