mirror of
https://github.com/python/cpython.git
synced 2025-11-24 20:30:18 +00:00
[3.14] GH-133789: Fix unpickling of pathlib objects pickled in Python 3.13 (GH-133831) (#140276)
Some checks are pending
Tests / (push) Blocked by required conditions
Tests / Windows MSI (push) Blocked by required conditions
Tests / Docs (push) Blocked by required conditions
Tests / Change detection (push) Waiting to run
Tests / Check if the ABI has changed (push) Blocked by required conditions
Tests / Check if Autoconf files are up to date (push) Blocked by required conditions
Tests / Check if generated files are up to date (push) Blocked by required conditions
Tests / Ubuntu SSL tests with OpenSSL (push) Blocked by required conditions
Tests / Android (aarch64) (push) Blocked by required conditions
Tests / Android (x86_64) (push) Blocked by required conditions
Tests / WASI (push) Blocked by required conditions
Tests / Hypothesis tests on Ubuntu (push) Blocked by required conditions
Tests / Address sanitizer (push) Blocked by required conditions
Tests / Sanitizers (push) Blocked by required conditions
Tests / Cross build Linux (push) Blocked by required conditions
Tests / CIFuzz (push) Blocked by required conditions
Tests / All required checks pass (push) Blocked by required conditions
Lint / lint (push) Waiting to run
Some checks are pending
Tests / (push) Blocked by required conditions
Tests / Windows MSI (push) Blocked by required conditions
Tests / Docs (push) Blocked by required conditions
Tests / Change detection (push) Waiting to run
Tests / Check if the ABI has changed (push) Blocked by required conditions
Tests / Check if Autoconf files are up to date (push) Blocked by required conditions
Tests / Check if generated files are up to date (push) Blocked by required conditions
Tests / Ubuntu SSL tests with OpenSSL (push) Blocked by required conditions
Tests / Android (aarch64) (push) Blocked by required conditions
Tests / Android (x86_64) (push) Blocked by required conditions
Tests / WASI (push) Blocked by required conditions
Tests / Hypothesis tests on Ubuntu (push) Blocked by required conditions
Tests / Address sanitizer (push) Blocked by required conditions
Tests / Sanitizers (push) Blocked by required conditions
Tests / Cross build Linux (push) Blocked by required conditions
Tests / CIFuzz (push) Blocked by required conditions
Tests / All required checks pass (push) Blocked by required conditions
Lint / lint (push) Waiting to run
GH-133789: Fix unpickling of pathlib objects pickled in Python 3.13 (GH-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+
(cherry picked from commit f4e51f253a)
Co-authored-by: Barney Gale <barney.gale@gmail.com>
This commit is contained in:
parent
e07b78c01a
commit
f59236b746
3 changed files with 19 additions and 0 deletions
12
Lib/pathlib/_local.py
Normal file
12
Lib/pathlib/_local.py
Normal 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",
|
||||||
|
]
|
||||||
|
|
@ -293,6 +293,12 @@ class PurePathTest(unittest.TestCase):
|
||||||
self.assertEqual(hash(pp), hash(p))
|
self.assertEqual(hash(pp), hash(p))
|
||||||
self.assertEqual(str(pp), str(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):
|
def test_repr_common(self):
|
||||||
for pathstr in ('a', 'a/b', 'a/b/c', '/', '/a/b', '/a/b/c'):
|
for pathstr in ('a', 'a/b', 'a/b/c', '/', '/a/b', '/a/b/c'):
|
||||||
with self.subTest(pathstr=pathstr):
|
with self.subTest(pathstr=pathstr):
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
Fix unpickling of :mod:`pathlib` objects that were pickled in Python 3.13.
|
||||||
Loading…
Add table
Add a link
Reference in a new issue