Skip to content

Commit 5136459

Browse files
carljmcarljm
committed
Merge branch 'main' into superopt
* main: Remove `expert-*` from `project-updater` GH workflow (python#103579) pythongh-103583: Add codecs and maps to _codecs_* module state (python#103540) pythongh-48330: address review comments to PR-12271 (python#103209) pythongh-103527: Add multibytecodec.h as make dep for _codecs_* (python#103567) pythongh-103553: Improve `test_inspect`: add more assertions, remove unused (python#103554) pythonGH-103517: Improve tests for `pathlib.Path.walk()` (pythonGH-103518) pythongh-102114: Make dis print more concise tracebacks for syntax errors in str inputs (python#102115) pythonGH-78079: Fix UNC device path root normalization in pathlib (pythonGH-102003) pythongh-101517: Add regression test for a lineno bug in try/except* impacting pdb (python#103547) pythongh-103527: Add make deps for _codecs_* and _multibytecodec (python#103528) pythongh-103532: Fix reST syntax in NEWS entry (pythonGH-103544) pythongh-103532: Add NEWS entry (python#103542)
2 parents 94399c2 + 76933df commit 5136459

24 files changed

+313
-162
lines changed

Diff for: ‎.github/workflows/project-updater.yml

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
# if an issue has any of these labels, it will be added
2121
# to the corresponding project
2222
- { project: 2, label: "release-blocker, deferred-blocker" }
23-
- { project: 3, label: expert-subinterpreters }
24-
- { project: 29, label: expert-asyncio }
2523
- { project: 32, label: sprint }
2624

2725
steps:

Diff for: ‎Doc/library/unittest.rst

-4
Original file line numberDiff line numberDiff line change
@@ -2191,10 +2191,6 @@ Loading and running tests
21912191
.. versionadded:: 3.12
21922192
Added *durations* keyword argument.
21932193

2194-
.. versionchanged:: 3.12
2195-
Subclasses should accept ``**kwargs`` to ensure compatibility as the
2196-
interface changes.
2197-
21982194
.. data:: defaultTestLoader
21992195

22002196
Instance of the :class:`TestLoader` class intended to be shared. If no

Diff for: ‎Lib/dis.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ def _try_compile(source, name):
6565
expect code objects
6666
"""
6767
try:
68-
c = compile(source, name, 'eval')
68+
return compile(source, name, 'eval')
6969
except SyntaxError:
70-
c = compile(source, name, 'exec')
71-
return c
70+
pass
71+
return compile(source, name, 'exec')
7272

7373
def dis(x=None, *, file=None, depth=None, show_caches=False, adaptive=False):
7474
"""Disassemble classes, methods, functions, and other compiled objects.

Diff for: ‎Lib/pathlib.py

+8-3
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,14 @@ def _parse_path(cls, path):
322322
if altsep:
323323
path = path.replace(altsep, sep)
324324
drv, root, rel = cls._flavour.splitroot(path)
325-
if drv.startswith(sep):
326-
# pathlib assumes that UNC paths always have a root.
327-
root = sep
325+
if not root and drv.startswith(sep) and not drv.endswith(sep):
326+
drv_parts = drv.split(sep)
327+
if len(drv_parts) == 4 and drv_parts[2] not in '?.':
328+
# e.g. //server/share
329+
root = sep
330+
elif len(drv_parts) == 6:
331+
# e.g. //?/unc/server/share
332+
root = sep
328333
parsed = [sys.intern(str(x)) for x in rel.split(sep) if x and x != '.']
329334
return drv, root, parsed
330335

Diff for: ‎Lib/test/test_dis.py

+7
Original file line numberDiff line numberDiff line change
@@ -1067,6 +1067,13 @@ def check(expected, **kwargs):
10671067
check(dis_nested_2, depth=None)
10681068
check(dis_nested_2)
10691069

1070+
def test__try_compile_no_context_exc_on_error(self):
1071+
# see gh-102114
1072+
try:
1073+
dis._try_compile(")", "")
1074+
except Exception as e:
1075+
self.assertIsNone(e.__context__)
1076+
10701077
@staticmethod
10711078
def code_quicken(f, times=ADAPTIVE_WARMUP_DELAY):
10721079
for _ in range(times):

Diff for: ‎Lib/test/test_inspect.py

+9-15
Original file line numberDiff line numberDiff line change
@@ -1820,8 +1820,7 @@ def test_errors(self):
18201820
self.assertEqualException(f, '2, 3, 4')
18211821
self.assertEqualException(f, '1, 2, 3, a=1')
18221822
self.assertEqualException(f, '2, 3, 4, c=5')
1823-
# XXX: success of this one depends on dict order
1824-
## self.assertEqualException(f, '2, 3, 4, a=1, c=5')
1823+
self.assertEqualException(f, '2, 3, 4, a=1, c=5')
18251824
# f got an unexpected keyword argument
18261825
self.assertEqualException(f, 'c=2')
18271826
self.assertEqualException(f, '2, c=3')
@@ -1832,17 +1831,19 @@ def test_errors(self):
18321831
self.assertEqualException(f, '1, a=2')
18331832
self.assertEqualException(f, '1, **{"a":2}')
18341833
self.assertEqualException(f, '1, 2, b=3')
1835-
# XXX: Python inconsistency
1836-
# - for functions and bound methods: unexpected keyword 'c'
1837-
# - for unbound methods: multiple values for keyword 'a'
1838-
#self.assertEqualException(f, '1, c=3, a=2')
1834+
self.assertEqualException(f, '1, c=3, a=2')
18391835
# issue11256:
18401836
f3 = self.makeCallable('**c')
18411837
self.assertEqualException(f3, '1, 2')
18421838
self.assertEqualException(f3, '1, 2, a=1, b=2')
18431839
f4 = self.makeCallable('*, a, b=0')
1844-
self.assertEqualException(f3, '1, 2')
1845-
self.assertEqualException(f3, '1, 2, a=1, b=2')
1840+
self.assertEqualException(f4, '1, 2')
1841+
self.assertEqualException(f4, '1, 2, a=1, b=2')
1842+
self.assertEqualException(f4, 'a=1, a=3')
1843+
self.assertEqualException(f4, 'a=1, c=3')
1844+
self.assertEqualException(f4, 'a=1, a=3, b=4')
1845+
self.assertEqualException(f4, 'a=1, b=2, a=3, b=4')
1846+
self.assertEqualException(f4, 'a=1, a=2, a=3, b=4')
18461847

18471848
# issue #20816: getcallargs() fails to iterate over non-existent
18481849
# kwonlydefaults and raises a wrong TypeError
@@ -2872,8 +2873,6 @@ def foo(cls, *, arg):
28722873
def test_signature_on_partial(self):
28732874
from functools import partial
28742875

2875-
Parameter = inspect.Parameter
2876-
28772876
def test():
28782877
pass
28792878

@@ -2988,8 +2987,6 @@ def test(a, b, c:int) -> 42:
29882987
((('c', ..., int, "positional_or_keyword"),),
29892988
42))
29902989

2991-
psig = inspect.signature(partial(partial(test, 1), 2))
2992-
29932990
def foo(a):
29942991
return a
29952992
_foo = partial(partial(foo, a=10), a=20)
@@ -4153,8 +4150,6 @@ def test(a, *args, b, z=100, **kwargs):
41534150
self.assertEqual(ba.args, (10, 20))
41544151

41554152
def test_signature_bind_positional_only(self):
4156-
P = inspect.Parameter
4157-
41584153
def test(a_po, b_po, c_po=3, /, foo=42, *, bar=50, **kwargs):
41594154
return a_po, b_po, c_po, foo, bar, kwargs
41604155

@@ -4578,7 +4573,6 @@ def test_qualname_source(self):
45784573
self.assertEqual(err, b'')
45794574

45804575
def test_builtins(self):
4581-
module = importlib.import_module('unittest')
45824576
_, out, err = assert_python_failure('-m', 'inspect',
45834577
'sys')
45844578
lines = err.decode().splitlines()

Diff for: ‎Lib/test/test_ntpath.py

+8
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ def test_splitroot(self):
169169

170170
# gh-81790: support device namespace, including UNC drives.
171171
tester('ntpath.splitroot("//?/c:")', ("//?/c:", "", ""))
172+
tester('ntpath.splitroot("//./c:")', ("//./c:", "", ""))
172173
tester('ntpath.splitroot("//?/c:/")', ("//?/c:", "/", ""))
173174
tester('ntpath.splitroot("//?/c:/dir")', ("//?/c:", "/", "dir"))
174175
tester('ntpath.splitroot("//?/UNC")', ("//?/UNC", "", ""))
@@ -179,8 +180,12 @@ def test_splitroot(self):
179180
tester('ntpath.splitroot("//?/VOLUME{00000000-0000-0000-0000-000000000000}/spam")',
180181
('//?/VOLUME{00000000-0000-0000-0000-000000000000}', '/', 'spam'))
181182
tester('ntpath.splitroot("//?/BootPartition/")', ("//?/BootPartition", "/", ""))
183+
tester('ntpath.splitroot("//./BootPartition/")', ("//./BootPartition", "/", ""))
184+
tester('ntpath.splitroot("//./PhysicalDrive0")', ("//./PhysicalDrive0", "", ""))
185+
tester('ntpath.splitroot("//./nul")', ("//./nul", "", ""))
182186

183187
tester('ntpath.splitroot("\\\\?\\c:")', ("\\\\?\\c:", "", ""))
188+
tester('ntpath.splitroot("\\\\.\\c:")', ("\\\\.\\c:", "", ""))
184189
tester('ntpath.splitroot("\\\\?\\c:\\")', ("\\\\?\\c:", "\\", ""))
185190
tester('ntpath.splitroot("\\\\?\\c:\\dir")', ("\\\\?\\c:", "\\", "dir"))
186191
tester('ntpath.splitroot("\\\\?\\UNC")', ("\\\\?\\UNC", "", ""))
@@ -193,6 +198,9 @@ def test_splitroot(self):
193198
tester('ntpath.splitroot("\\\\?\\VOLUME{00000000-0000-0000-0000-000000000000}\\spam")',
194199
('\\\\?\\VOLUME{00000000-0000-0000-0000-000000000000}', '\\', 'spam'))
195200
tester('ntpath.splitroot("\\\\?\\BootPartition\\")', ("\\\\?\\BootPartition", "\\", ""))
201+
tester('ntpath.splitroot("\\\\.\\BootPartition\\")', ("\\\\.\\BootPartition", "\\", ""))
202+
tester('ntpath.splitroot("\\\\.\\PhysicalDrive0")', ("\\\\.\\PhysicalDrive0", "", ""))
203+
tester('ntpath.splitroot("\\\\.\\nul")', ("\\\\.\\nul", "", ""))
196204

197205
# gh-96290: support partial/invalid UNC drives
198206
tester('ntpath.splitroot("//")', ("//", "", "")) # empty server & missing share

Diff for: ‎Lib/test/test_pathlib.py

+69-32
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,9 @@ def test_drive_root_parts(self):
810810
check(('c:/a',), 'c:', '\\', ('c:\\', 'a'))
811811
check(('/a',), '', '\\', ('\\', 'a'))
812812
# UNC paths.
813+
check(('//',), '\\\\', '', ('\\\\',))
814+
check(('//a',), '\\\\a', '', ('\\\\a',))
815+
check(('//a/',), '\\\\a\\', '', ('\\\\a\\',))
813816
check(('//a/b',), '\\\\a\\b', '\\', ('\\\\a\\b\\',))
814817
check(('//a/b/',), '\\\\a\\b', '\\', ('\\\\a\\b\\',))
815818
check(('//a/b/c',), '\\\\a\\b', '\\', ('\\\\a\\b\\', 'c'))
@@ -823,12 +826,26 @@ def test_drive_root_parts(self):
823826
# UNC paths.
824827
check(('a', '//b/c//', 'd'), '\\\\b\\c', '\\', ('\\\\b\\c\\', 'd'))
825828
# Extended paths.
829+
check(('//./c:',), '\\\\.\\c:', '', ('\\\\.\\c:',))
826830
check(('//?/c:/',), '\\\\?\\c:', '\\', ('\\\\?\\c:\\',))
827831
check(('//?/c:/a',), '\\\\?\\c:', '\\', ('\\\\?\\c:\\', 'a'))
828832
check(('//?/c:/a', '/b'), '\\\\?\\c:', '\\', ('\\\\?\\c:\\', 'b'))
829833
# Extended UNC paths (format is "\\?\UNC\server\share").
834+
check(('//?',), '\\\\?', '', ('\\\\?',))
835+
check(('//?/',), '\\\\?\\', '', ('\\\\?\\',))
836+
check(('//?/UNC',), '\\\\?\\UNC', '', ('\\\\?\\UNC',))
837+
check(('//?/UNC/',), '\\\\?\\UNC\\', '', ('\\\\?\\UNC\\',))
838+
check(('//?/UNC/b',), '\\\\?\\UNC\\b', '', ('\\\\?\\UNC\\b',))
839+
check(('//?/UNC/b/',), '\\\\?\\UNC\\b\\', '', ('\\\\?\\UNC\\b\\',))
830840
check(('//?/UNC/b/c',), '\\\\?\\UNC\\b\\c', '\\', ('\\\\?\\UNC\\b\\c\\',))
841+
check(('//?/UNC/b/c/',), '\\\\?\\UNC\\b\\c', '\\', ('\\\\?\\UNC\\b\\c\\',))
831842
check(('//?/UNC/b/c/d',), '\\\\?\\UNC\\b\\c', '\\', ('\\\\?\\UNC\\b\\c\\', 'd'))
843+
# UNC device paths
844+
check(('//./BootPartition/',), '\\\\.\\BootPartition', '\\', ('\\\\.\\BootPartition\\',))
845+
check(('//?/BootPartition/',), '\\\\?\\BootPartition', '\\', ('\\\\?\\BootPartition\\',))
846+
check(('//./PhysicalDrive0',), '\\\\.\\PhysicalDrive0', '', ('\\\\.\\PhysicalDrive0',))
847+
check(('//?/Volume{}/',), '\\\\?\\Volume{}', '\\', ('\\\\?\\Volume{}\\',))
848+
check(('//./nul',), '\\\\.\\nul', '', ('\\\\.\\nul',))
832849
# Second part has a root but not drive.
833850
check(('a', '/b', 'c'), '', '\\', ('\\', 'b', 'c'))
834851
check(('Z:/a', '/b', 'c'), 'Z:', '\\', ('Z:\\', 'b', 'c'))
@@ -1371,6 +1388,13 @@ def test_join(self):
13711388
self.assertEqual(pp, P('C:/a/b/dd:s'))
13721389
pp = p.joinpath(P('E:d:s'))
13731390
self.assertEqual(pp, P('E:d:s'))
1391+
# Joining onto a UNC path with no root
1392+
pp = P('//').joinpath('server')
1393+
self.assertEqual(pp, P('//server'))
1394+
pp = P('//server').joinpath('share')
1395+
self.assertEqual(pp, P('//server/share'))
1396+
pp = P('//./BootPartition').joinpath('Windows')
1397+
self.assertEqual(pp, P('//./BootPartition/Windows'))
13741398

13751399
def test_div(self):
13761400
# Basically the same as joinpath().
@@ -2678,20 +2702,20 @@ def setUp(self):
26782702
del self.sub2_tree[1][:1]
26792703

26802704
def test_walk_topdown(self):
2681-
all = list(self.walk_path.walk())
2682-
2683-
self.assertEqual(len(all), 4)
2684-
# We can't know which order SUB1 and SUB2 will appear in.
2685-
# Not flipped: TESTFN, SUB1, SUB11, SUB2
2686-
# flipped: TESTFN, SUB2, SUB1, SUB11
2687-
flipped = all[0][1][0] != "SUB1"
2688-
all[0][1].sort()
2689-
all[3 - 2 * flipped][-1].sort()
2690-
all[3 - 2 * flipped][1].sort()
2691-
self.assertEqual(all[0], (self.walk_path, ["SUB1", "SUB2"], ["tmp1"]))
2692-
self.assertEqual(all[1 + flipped], (self.sub1_path, ["SUB11"], ["tmp2"]))
2693-
self.assertEqual(all[2 + flipped], (self.sub11_path, [], []))
2694-
self.assertEqual(all[3 - 2 * flipped], self.sub2_tree)
2705+
walker = self.walk_path.walk()
2706+
entry = next(walker)
2707+
entry[1].sort() # Ensure we visit SUB1 before SUB2
2708+
self.assertEqual(entry, (self.walk_path, ["SUB1", "SUB2"], ["tmp1"]))
2709+
entry = next(walker)
2710+
self.assertEqual(entry, (self.sub1_path, ["SUB11"], ["tmp2"]))
2711+
entry = next(walker)
2712+
self.assertEqual(entry, (self.sub11_path, [], []))
2713+
entry = next(walker)
2714+
entry[1].sort()
2715+
entry[2].sort()
2716+
self.assertEqual(entry, self.sub2_tree)
2717+
with self.assertRaises(StopIteration):
2718+
next(walker)
26952719

26962720
def test_walk_prune(self, walk_path=None):
26972721
if walk_path is None:
@@ -2715,24 +2739,37 @@ def test_file_like_path(self):
27152739
self.test_walk_prune(FakePath(self.walk_path).__fspath__())
27162740

27172741
def test_walk_bottom_up(self):
2718-
all = list(self.walk_path.walk( top_down=False))
2719-
2720-
self.assertEqual(len(all), 4, all)
2721-
# We can't know which order SUB1 and SUB2 will appear in.
2722-
# Not flipped: SUB11, SUB1, SUB2, TESTFN
2723-
# flipped: SUB2, SUB11, SUB1, TESTFN
2724-
flipped = all[3][1][0] != "SUB1"
2725-
all[3][1].sort()
2726-
all[2 - 2 * flipped][-1].sort()
2727-
all[2 - 2 * flipped][1].sort()
2728-
self.assertEqual(all[3],
2729-
(self.walk_path, ["SUB1", "SUB2"], ["tmp1"]))
2730-
self.assertEqual(all[flipped],
2731-
(self.sub11_path, [], []))
2732-
self.assertEqual(all[flipped + 1],
2733-
(self.sub1_path, ["SUB11"], ["tmp2"]))
2734-
self.assertEqual(all[2 - 2 * flipped],
2735-
self.sub2_tree)
2742+
seen_testfn = seen_sub1 = seen_sub11 = seen_sub2 = False
2743+
for path, dirnames, filenames in self.walk_path.walk(top_down=False):
2744+
if path == self.walk_path:
2745+
self.assertFalse(seen_testfn)
2746+
self.assertTrue(seen_sub1)
2747+
self.assertTrue(seen_sub2)
2748+
self.assertEqual(sorted(dirnames), ["SUB1", "SUB2"])
2749+
self.assertEqual(filenames, ["tmp1"])
2750+
seen_testfn = True
2751+
elif path == self.sub1_path:
2752+
self.assertFalse(seen_testfn)
2753+
self.assertFalse(seen_sub1)
2754+
self.assertTrue(seen_sub11)
2755+
self.assertEqual(dirnames, ["SUB11"])
2756+
self.assertEqual(filenames, ["tmp2"])
2757+
seen_sub1 = True
2758+
elif path == self.sub11_path:
2759+
self.assertFalse(seen_sub1)
2760+
self.assertFalse(seen_sub11)
2761+
self.assertEqual(dirnames, [])
2762+
self.assertEqual(filenames, [])
2763+
seen_sub11 = True
2764+
elif path == self.sub2_path:
2765+
self.assertFalse(seen_testfn)
2766+
self.assertFalse(seen_sub2)
2767+
self.assertEqual(sorted(dirnames), sorted(self.sub2_tree[1]))
2768+
self.assertEqual(sorted(filenames), sorted(self.sub2_tree[2]))
2769+
seen_sub2 = True
2770+
else:
2771+
raise AssertionError(f"Unexpected path: {path}")
2772+
self.assertTrue(seen_testfn)
27362773

27372774
@os_helper.skip_unless_symlink
27382775
def test_walk_follow_symlinks(self):

Diff for: ‎Lib/test/test_pdb.py

+20
Original file line numberDiff line numberDiff line change
@@ -1700,6 +1700,26 @@ def test_pdb_issue_gh_103225():
17001700
(Pdb) continue
17011701
"""
17021702

1703+
def test_pdb_issue_gh_101517():
1704+
"""See GH-101517
1705+
1706+
Make sure pdb doesn't crash when the exception is caught in a try/except* block
1707+
1708+
>>> def test_function():
1709+
... try:
1710+
... raise KeyError
1711+
... except* Exception as e:
1712+
... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
1713+
1714+
>>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
1715+
... 'continue'
1716+
... ]):
1717+
... test_function()
1718+
--Return--
1719+
> <doctest test.test_pdb.test_pdb_issue_gh_101517[0]>(None)test_function()->None
1720+
(Pdb) continue
1721+
"""
1722+
17031723

17041724
@support.requires_subprocess()
17051725
class PdbTestCase(unittest.TestCase):

Diff for: ‎Lib/test/test_unittest/test_runner.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -1367,7 +1367,7 @@ def testSpecifiedStreamUsed(self):
13671367
self.assertTrue(runner.stream.stream is f)
13681368

13691369
def test_durations(self):
1370-
def run(test, expect_durations):
1370+
def run(test, *, expect_durations=True):
13711371
stream = BufferedWriter()
13721372
runner = unittest.TextTestRunner(stream=stream, durations=5, verbosity=2)
13731373
result = runner.run(test)
@@ -1389,21 +1389,21 @@ class Foo(unittest.TestCase):
13891389
def test_1(self):
13901390
pass
13911391

1392-
run(Foo('test_1'), True)
1392+
run(Foo('test_1'), expect_durations=True)
13931393

13941394
# failure
13951395
class Foo(unittest.TestCase):
13961396
def test_1(self):
13971397
self.assertEqual(0, 1)
13981398

1399-
run(Foo('test_1'), True)
1399+
run(Foo('test_1'), expect_durations=True)
14001400

14011401
# error
14021402
class Foo(unittest.TestCase):
14031403
def test_1(self):
14041404
1 / 0
14051405

1406-
run(Foo('test_1'), True)
1406+
run(Foo('test_1'), expect_durations=True)
14071407

14081408

14091409
# error in setUp and tearDown
@@ -1414,15 +1414,15 @@ def setUp(self):
14141414
def test_1(self):
14151415
pass
14161416

1417-
run(Foo('test_1'), True)
1417+
run(Foo('test_1'), expect_durations=True)
14181418

14191419
# skip (expect no durations)
14201420
class Foo(unittest.TestCase):
14211421
@unittest.skip("reason")
14221422
def test_1(self):
14231423
pass
14241424

1425-
run(Foo('test_1'), False)
1425+
run(Foo('test_1'), expect_durations=False)
14261426

14271427

14281428

0 commit comments

Comments
 (0)