8000 Merge branch 'main' into gh-114847 · barneygale/cpython@211167e · GitHub
[go: up one dir, main page]
Skip to content

Commit 211167e

Browse files
barneygalebarneygale
committed
Merge branch 'main' into pythongh-114847 
2 parents 31955ee + c43f6a4 commit 211167e

25 files changed

+2608
-1968
lines changed

‎Include/internal/pycore_uop_ids.h

Lines changed: 108 additions & 107 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Include/internal/pycore_uop_metadata.h

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Lib/test/string_tests.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,15 +1503,15 @@ def test_find_etc_raise_correct_error_messages(self):
15031503
# issue 11828
15041504
s = 'hello'
15051505
x = 'x'
1506-
self.assertRaisesRegex(TypeError, r'^find\(', s.find,
1506+
self.assertRaisesRegex(TypeError, r'^find\b', s.find,
15071507
x, None, None, None)
1508-
self.assertRaisesRegex(TypeError, r'^rfind\(', s.rfind,
1508+
self.assertRaisesRegex(TypeError, r'^rfind\b', s.rfind,
15091509
x, None, None, None)
1510-
self.assertRaisesRegex(TypeError, r'^index\(', s.index,
1510+
self.assertRaisesRegex(TypeError, r'^index\b', s.index,
15111511
x, None, None, None)
1512-
self.assertRaisesRegex(TypeError, r'^rindex\(', s.rindex,
1512+
self.assertRaisesRegex(TypeError, r'^rindex\b', s.rindex,
15131513
x, None, None, None)
1514-
self.assertRaisesRegex(TypeError, r'^count\(', s.count,
1514+
self.assertRaisesRegex(TypeError, r'^count\b', s.count,
15151515
x, None, None, None)
15161516
self.assertRaisesRegex(TypeError, r'^startswith\b', s.startswith,
15171517
x, None, None, None)

‎Lib/test/support/interpreters/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def __getattr__(name):
4343
{formatted}
4444
""".strip()
4545

46-
class ExecutionFailed(RuntimeError):
46+
class ExecutionFailed(InterpreterError):
4747
"""An unhandled exception happened during execution.
4848
4949
This is raised from Interpreter.exec() and Interpreter.call().
@@ -158,7 +158,7 @@ def close(self):
158158
"""Finalize and destroy the interpreter.
159159
160160
Attempting to destroy the current interpreter results
161-
in a RuntimeError.
161+
in an InterpreterError.
162162
"""
163163
return _interpreters.destroy(self._id)
164164

0 commit comments

Comments
 (0)
0