From 5ece24a4e49d671337287eab792f89ec674667a1 Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Wed, 2 Oct 2024 20:47:59 -0700 Subject: [PATCH 1/3] Remove stubtest allowlists for paths in 3.13 --- stdlib/@tests/stubtest_allowlists/darwin-py313.txt | 3 --- stdlib/@tests/stubtest_allowlists/linux-py313.txt | 2 -- stdlib/@tests/stubtest_allowlists/py313.txt | 1 - stdlib/@tests/stubtest_allowlists/win32-py313.txt | 7 ------- 4 files changed, 13 deletions(-) delete mode 100644 stdlib/@tests/stubtest_allowlists/linux-py313.txt diff --git a/stdlib/@tests/stubtest_allowlists/darwin-py313.txt b/stdlib/@tests/stubtest_allowlists/darwin-py313.txt index b58da34e1fe2..93aba7894772 100644 --- a/stdlib/@tests/stubtest_allowlists/darwin-py313.txt +++ b/stdlib/@tests/stubtest_allowlists/darwin-py313.txt @@ -1,6 +1,3 @@ -# new in py313 -posixpath.splitroot - # Depends on HAVE_NCURSESW and how we install CPython, # should be removed when 3.13 will be officially released: _?curses.unget_wch diff --git a/stdlib/@tests/stubtest_allowlists/linux-py313.txt b/stdlib/@tests/stubtest_allowlists/linux-py313.txt deleted file mode 100644 index e76c72d2ca32..000000000000 --- a/stdlib/@tests/stubtest_allowlists/linux-py313.txt +++ /dev/null @@ -1,2 +0,0 @@ -# TODO: triage these (new in py313) -posixpath.splitroot diff --git a/stdlib/@tests/stubtest_allowlists/py313.txt b/stdlib/@tests/stubtest_allowlists/py313.txt index 8ddbb8fe3089..cd8630b479be 100644 --- a/stdlib/@tests/stubtest_allowlists/py313.txt +++ b/stdlib/@tests/stubtest_allowlists/py313.txt @@ -4,7 +4,6 @@ # TODO: triage these new errors _tkinter.create -os.path.splitroot tkinter.Misc.after_info tkinter.Misc.busy tkinter.Misc.busy_cget diff --git a/stdlib/@tests/stubtest_allowlists/win32-py313.txt b/stdlib/@tests/stubtest_allowlists/win32-py313.txt index 1f2749e76735..4d170e27f61a 100644 --- a/stdlib/@tests/stubtest_allowlists/win32-py313.txt +++ b/stdlib/@tests/stubtest_allowlists/win32-py313.txt @@ -1,10 +1,3 @@ -# New in py313 (triage these!) -ntpath.exists -ntpath.lexists -ntpath.splitroot -os.path.exists -os.path.lexists - # Undocumented internal method, not really for public consumption. # (Hard to add types for unless we add stubs for the undocumented _overlapped module...) asyncio.IocpProactor.finish_socket_func From 5d1573f17b6c6bfb92b04e58e58746053af5a64e Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Wed, 2 Oct 2024 20:54:35 -0700 Subject: [PATCH 2/3] add back splitroot --- stdlib/@tests/stubtest_allowlists/py313.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/stdlib/@tests/stubtest_allowlists/py313.txt b/stdlib/@tests/stubtest_allowlists/py313.txt index cd8630b479be..11898e22104d 100644 --- a/stdlib/@tests/stubtest_allowlists/py313.txt +++ b/stdlib/@tests/stubtest_allowlists/py313.txt @@ -24,6 +24,11 @@ tkinter.Misc.tk_busy_status tkinter.Text.count tkinter.Wm.wm_attributes +# Name of the "p" parameter changed to "path", but is +# expected to get changed back in 3.13.1: +# https://github.com/python/cpython/pull/124097 +(os\.path|ntpath|posixpath)\.splitroot + # ====================================== # Pre-existing errors from Python <=3.12 # ====================================== From 13c1367f12b5f2b1066381f46b21374027a6dfdd Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Wed, 2 Oct 2024 21:13:22 -0700 Subject: [PATCH 3/3] Restore exists --- stdlib/@tests/stubtest_allowlists/win32-py313.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stdlib/@tests/stubtest_allowlists/win32-py313.txt b/stdlib/@tests/stubtest_allowlists/win32-py313.txt index 4d170e27f61a..461872c053e8 100644 --- a/stdlib/@tests/stubtest_allowlists/win32-py313.txt +++ b/stdlib/@tests/stubtest_allowlists/win32-py313.txt @@ -2,3 +2,7 @@ # (Hard to add types for unless we add stubs for the undocumented _overlapped module...) asyncio.IocpProactor.finish_socket_func asyncio.windows_events.IocpProactor.finish_socket_func + +# Argument was made keyword-only, may be fixed in 3.13.1 +# https://github.com/python/cpython/issues/124917 +(os\.path|ntpath)\.l?exists