Compare commits

...

2 commits

Author SHA1 Message Date
Barney Gale
f4e51f253a
GH-133789: Fix unpickling of pathlib objects pickled in Python 3.13 (#133831)
In Python 3.13 (but not 3.12 or 3.14), pathlib classes are defined in
`pathlib._local` rather than `pathlib`. In hindsight this was a mistake,
but it was difficult to predict how the abstract/local split would pan out.

In this patch we re-introduce `pathlib._local` as a stub module that
re-exports the classes from `pathlib`. This allows path objects pickled in
3.13 to be unpicked in 3.14+
2025-10-17 21:57:51 +00:00
Ayappan Perumal
92025ea2c8
gh-140239: Check statx availability only on Linux (#140249) 2025-10-17 19:40:16 +02:00
6 changed files with 37 additions and 7 deletions

12
Lib/pathlib/_local.py Normal file
View file

@ -0,0 +1,12 @@
"""
This module exists so that pathlib objects pickled under Python 3.13 can be
unpickled in 3.14+.
"""
from pathlib import *
__all__ = [
"UnsupportedOperation",
"PurePath", "PurePosixPath", "PureWindowsPath",
"Path", "PosixPath", "WindowsPath",
]

View file

@ -293,6 +293,12 @@ def test_pickling_common(self):
self.assertEqual(hash(pp), hash(p))
self.assertEqual(str(pp), str(p))
def test_unpicking_3_13(self):
data = (b"\x80\x04\x95'\x00\x00\x00\x00\x00\x00\x00\x8c\x0e"
b"pathlib._local\x94\x8c\rPurePosixPath\x94\x93\x94)R\x94.")
p = pickle.loads(data)
self.assertIsInstance(p, pathlib.PurePosixPath)
def test_repr_common(self):
for pathstr in ('a', 'a/b', 'a/b/c', '/', '/a/b', '/a/b/c'):
with self.subTest(pathstr=pathstr):

View file

@ -0,0 +1 @@
Check ``statx`` availability only in Linux platforms

View file

@ -0,0 +1 @@
Fix unpickling of :mod:`pathlib` objects that were pickled in Python 3.13.

17
configure generated vendored
View file

@ -20191,12 +20191,6 @@ if test "x$ac_cv_func_splice" = xyes
then :
printf "%s\n" "#define HAVE_SPLICE 1" >>confdefs.h
fi
ac_fn_c_check_func "$LINENO" "statx" "ac_cv_func_statx"
if test "x$ac_cv_func_statx" = xyes
then :
printf "%s\n" "#define HAVE_STATX 1" >>confdefs.h
fi
ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
if test "x$ac_cv_func_strftime" = xyes
@ -20398,6 +20392,17 @@ then :
fi
# Check statx availability in Linux
if test "$MACHDEP" = "linux"; then
ac_fn_c_check_func "$LINENO" "statx" "ac_cv_func_statx"
if test "x$ac_cv_func_statx" = xyes
then :
printf "%s\n" "#define HAVE_STATX 1" >>confdefs.h
fi
fi
# Force lchmod off for Linux. Linux disallows changing the mode of symbolic
# links. Some libc implementations have a stub lchmod implementation that always
# returns an error.

View file

@ -5251,12 +5251,17 @@ AC_CHECK_FUNCS([ \
setitimer setlocale setpgid setpgrp setpriority setregid setresgid \
setresuid setreuid setsid setuid setvbuf shutdown sigaction sigaltstack \
sigfillset siginterrupt sigpending sigrelse sigtimedwait sigwait \
sigwaitinfo snprintf splice statx strftime strlcpy strsignal symlinkat sync \
sigwaitinfo snprintf splice strftime strlcpy strsignal symlinkat sync \
sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile \
tmpnam tmpnam_r truncate ttyname_r umask uname unlinkat unlockpt utimensat utimes vfork \
wait wait3 wait4 waitid waitpid wcscoll wcsftime wcsxfrm wmemcmp writev \
])
# Check statx availability in Linux
if test "$MACHDEP" = "linux"; then
AC_CHECK_FUNCS([statx])
fi
# Force lchmod off for Linux. Linux disallows changing the mode of symbolic
# links. Some libc implementations have a stub lchmod implementation that always
# returns an error.