Mailman 3 March 2025 - Python-checkins

[3.13] gh-130737: Fix multiprocessing test_notify() (GH-130797) (#130802)
by vstinner March 3, 2025

March 3, 2025

https://github.com/python/cpython/commit/d00e92bc04d90623b7cf665e23dd623a8d… commit: d00e92bc04d90623b7cf665e23dd623a8d7e02df branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: vstinner <vstinner(a)python.org> date: 2025-03-03T19:09:34Z summary: [3.13] gh-130737: Fix multiprocessing test_notify() (GH-130797) (#130802) gh-130737: Fix multiprocessing test_notify() (GH-130797) Replace hardcoded delay (100 ms) with a loop awaiting until a condition is true: replace assertReturnsIfImplemented() with assertReachesEventually(). Use sleeping_retry() in assertReachesEventually() to tolerate slow buildbots and raise an exception on timeout (30 seconds). (cherry picked from commit 8a64a62002fa3cdc93cb4cfee315edb235cad8cb) Co-authored-by: Victor Stinner <vstinner(a)python.org> files: M Lib/test/_test_multiprocessing.py diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index 84c8fa146709f6..d7de0f7113fe19 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -1577,14 +1577,13 @@ def f(cls, cond, sleeping, woken, timeout=None): cond.release() def assertReachesEventually(self, func, value): - for i in range(10): + for _ in support.sleeping_retry(support.SHORT_TIMEOUT): try: if func() == value: break except NotImplementedError: break - time.sleep(DELTA) - time.sleep(DELTA) + self.assertReturnsIfImplemented(value, func) def check_invariant(self, cond): @@ -1618,8 +1617,7 @@ def test_notify(self): sleeping.acquire() # check no process/thread has woken up - time.sleep(DELTA) - self.assertReturnsIfImplemented(0, get_value, woken) + self.assertReachesEventually(lambda: get_value(woken), 0) # wake up one process/thread cond.acquire() @@ -1627,8 +1625,7 @@ def test_notify(self): cond.release() # check one process/thread has woken up - time.sleep(DELTA) - self.assertReturnsIfImplemented(1, get_value, woken) + self.assertReachesEventually(lambda: get_value(woken), 1) # wake up another cond.acquire() @@ -1636,8 +1633,7 @@ def test_notify(self): cond.release() # check other has woken up - time.sleep(DELTA) - self.assertReturnsIfImplemented(2, get_value, woken) + self.assertReachesEventually(lambda: get_value(woken), 2) # check state is not mucked up self.check_invariant(cond)

1 0

[3.12] gh-130737: Fix multiprocessing test_notify() (GH-130797) (#130803)
by vstinner March 3, 2025

March 3, 2025

https://github.com/python/cpython/commit/519dec97e726d190e1c5c9a5ecf12b27e3… commit: 519dec97e726d190e1c5c9a5ecf12b27e3e5e1f4 branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: vstinner <vstinner(a)python.org> date: 2025-03-03T19:02:20Z summary: [3.12] gh-130737: Fix multiprocessing test_notify() (GH-130797) (#130803) gh-130737: Fix multiprocessing test_notify() (GH-130797) Replace hardcoded delay (100 ms) with a loop awaiting until a condition is true: replace assertReturnsIfImplemented() with assertReachesEventually(). Use sleeping_retry() in assertReachesEventually() to tolerate slow buildbots and raise an exception on timeout (30 seconds). (cherry picked from commit 8a64a62002fa3cdc93cb4cfee315edb235cad8cb) Co-authored-by: Victor Stinner <vstinner(a)python.org> files: M Lib/test/_test_multiprocessing.py diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index 85b7290b5a516c..1d4fd5d4c35842 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -1577,14 +1577,13 @@ def f(cls, cond, sleeping, woken, timeout=None): cond.release() def assertReachesEventually(self, func, value): - for i in range(10): + for _ in support.sleeping_retry(support.SHORT_TIMEOUT): try: if func() == value: break except NotImplementedError: break - time.sleep(DELTA) - time.sleep(DELTA) + self.assertReturnsIfImplemented(value, func) def check_invariant(self, cond): @@ -1618,8 +1617,7 @@ def test_notify(self): sleeping.acquire() # check no process/thread has woken up - time.sleep(DELTA) - self.assertReturnsIfImplemented(0, get_value, woken) + self.assertReachesEventually(lambda: get_value(woken), 0) # wake up one process/thread cond.acquire() @@ -1627,8 +1625,7 @@ def test_notify(self): cond.release() # check one process/thread has woken up - time.sleep(DELTA) - self.assertReturnsIfImplemented(1, get_value, woken) + self.assertReachesEventually(lambda: get_value(woken), 1) # wake up another cond.acquire() @@ -1636,8 +1633,7 @@ def test_notify(self): cond.release() # check other has woken up - time.sleep(DELTA) - self.assertReturnsIfImplemented(2, get_value, woken) + self.assertReachesEventually(lambda: get_value(woken), 2) # check state is not mucked up self.check_invariant(cond)

1 0

gh-130737: Fix multiprocessing test_notify() (#130797)
by vstinner March 3, 2025

March 3, 2025

https://github.com/python/cpython/commit/8a64a62002fa3cdc93cb4cfee315edb235… commit: 8a64a62002fa3cdc93cb4cfee315edb235cad8cb branch: main author: Victor Stinner <vstinner(a)python.org> committer: vstinner <vstinner(a)python.org> date: 2025-03-03T18:45:26Z summary: gh-130737: Fix multiprocessing test_notify() (#130797) Replace hardcoded delay (100 ms) with a loop awaiting until a condition is true: replace assertReturnsIfImplemented() with assertReachesEventually(). Use sleeping_retry() in assertReachesEventually() to tolerate slow buildbots and raise an exception on timeout (30 seconds). files: M Lib/test/_test_multiprocessing.py diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py index cafbc757904f64..f31151e53c4bb0 100644 --- a/Lib/test/_test_multiprocessing.py +++ b/Lib/test/_test_multiprocessing.py @@ -1622,14 +1622,13 @@ def f(cls, cond, sleeping, woken, timeout=None): cond.release() def assertReachesEventually(self, func, value): - for i in range(10): + for _ in support.sleeping_retry(support.SHORT_TIMEOUT): try: if func() == value: break except NotImplementedError: break - time.sleep(DELTA) - time.sleep(DELTA) + self.assertReturnsIfImplemented(value, func) def check_invariant(self, cond): @@ -1663,8 +1662,7 @@ def test_notify(self): sleeping.acquire() # check no process/thread has woken up - time.sleep(DELTA) - self.assertReturnsIfImplemented(0, get_value, woken) + self.assertReachesEventually(lambda: get_value(woken), 0) # wake up one process/thread cond.acquire() @@ -1672,8 +1670,7 @@ def test_notify(self): cond.release() # check one process/thread has woken up - time.sleep(DELTA) - self.assertReturnsIfImplemented(1, get_value, woken) + self.assertReachesEventually(lambda: get_value(woken), 1) # wake up another cond.acquire() @@ -1681,8 +1678,7 @@ def test_notify(self): cond.release() # check other has woken up - time.sleep(DELTA) - self.assertReturnsIfImplemented(2, get_value, woken) + self.assertReachesEventually(lambda: get_value(woken), 2) # check state is not mucked up self.check_invariant(cond)

1 0

GH-128520: Merge `pathlib._abc` into `pathlib.types` (#130747)
by barneygale March 3, 2025

March 3, 2025

https://github.com/python/cpython/commit/d0eb01c9de9a455df36f885506314d8d00… commit: d0eb01c9de9a455df36f885506314d8d00645c9f branch: main author: Barney Gale <barney.gale(a)gmail.com> committer: barneygale <barney.gale(a)gmail.com> date: 2025-03-03T17:56:57Z summary: GH-128520: Merge `pathlib._abc` into `pathlib.types` (#130747) There used to be a meaningful distinction between these modules: `pathlib` imported `pathlib._abc` but not `pathlib.types`. This is no longer the case (neither module is imported), so we move the ABCs as follows: - `pathlib._abc.JoinablePath` --> `pathlib.types._JoinablePath` - `pathlib._abc.ReadablePath` --> `pathlib.types._ReadablePath` - `pathlib._abc.WritablePath` --> `pathlib.types._WritablePath` files: D Lib/pathlib/_abc.py M Lib/pathlib/types.py M Lib/test/test_pathlib/test_pathlib.py M Lib/test/test_pathlib/test_pathlib_abc.py diff --git a/Lib/pathlib/_abc.py b/Lib/pathlib/_abc.py deleted file mode 100644 index d9fb018d75f538..00000000000000 --- a/Lib/pathlib/_abc.py +++ /dev/null @@ -1,397 +0,0 @@ -""" -Abstract base classes for rich path objects. - -This module is published as a PyPI package called "pathlib-abc". - -This module is also a *PRIVATE* part of the Python standard library, where -it's developed alongside pathlib. If it finds success and maturity as a PyPI -package, it could become a public part of the standard library. - -Three base classes are defined here -- JoinablePath, ReadablePath and -WritablePath. -""" - -from abc import ABC, abstractmethod -from glob import _PathGlobber, _no_recurse_symlinks -from pathlib import PurePath, Path -from pathlib._os import magic_open, ensure_distinct_paths, copy_file - - -def _explode_path(path): - """ - Split the path into a 2-tuple (anchor, parts), where *anchor* is the - uppermost parent of the path (equivalent to path.parents[-1]), and - *parts* is a reversed list of parts following the anchor. - """ - split = path.parser.split - path = str(path) - parent, name = split(path) - names = [] - while path != parent: - names.append(name) - path = parent - parent, name = split(path) - return path, names - - -class JoinablePath(ABC): - """Abstract base class for pure path objects. - - This class *does not* provide several magic methods that are defined in - its implementation PurePath. They are: __init__, __fspath__, __bytes__, - __reduce__, __hash__, __eq__, __lt__, __le__, __gt__, __ge__. - """ - __slots__ = () - - @property - @abstractmethod - def parser(self): - """Implementation of pathlib._types.Parser used for low-level path - parsing and manipulation. - """ - raise NotImplementedError - - @abstractmethod - def with_segments(self, *pathsegments): - """Construct a new path object from any number of path-like objects. - Subclasses may override this method to customize how new path objects - are created from methods like `iterdir()`. - """ - raise NotImplementedError - - @abstractmethod - def __str__(self): - """Return the string representation of the path, suitable for - passing to system calls.""" - raise NotImplementedError - - @property - def anchor(self): - """The concatenation of the drive and root, or ''.""" - return _explode_path(self)[0] - - @property - def name(self): - """The final path component, if any.""" - return self.parser.split(str(self))[1] - - @property - def suffix(self): - """ - The final component's last suffix, if any. - - This includes the leading period. For example: '.txt' - """ - return self.parser.splitext(self.name)[1] - - @property - def suffixes(self): - """ - A list of the final component's suffixes, if any. - - These include the leading periods. For example: ['.tar', '.gz'] - """ - split = self.parser.splitext - stem, suffix = split(self.name) - suffixes = [] - while suffix: - suffixes.append(suffix) - stem, suffix = split(stem) - return suffixes[::-1] - - @property - def stem(self): - """The final path component, minus its last suffix.""" - return self.parser.splitext(self.name)[0] - - def with_name(self, name): - """Return a new path with the file name changed.""" - split = self.parser.split - if split(name)[0]: - raise ValueError(f"Invalid name {name!r}") - return self.with_segments(split(str(self))[0], name) - - def with_stem(self, stem): - """Return a new path with the stem changed.""" - suffix = self.suffix - if not suffix: - return self.with_name(stem) - elif not stem: - # If the suffix is non-empty, we can't make the stem empty. - raise ValueError(f"{self!r} has a non-empty suffix") - else: - return self.with_name(stem + suffix) - - def with_suffix(self, suffix): - """Return a new path with the file suffix changed. If the path - has no suffix, add given suffix. If the given suffix is an empty - string, remove the suffix from the path. - """ - stem = self.stem - if not stem: - # If the stem is empty, we can't make the suffix non-empty. - raise ValueError(f"{self!r} has an empty name") - elif suffix and not suffix.startswith('.'): - raise ValueError(f"Invalid suffix {suffix!r}") - else: - return self.with_name(stem + suffix) - - @property - def parts(self): - """An object providing sequence-like access to the - components in the filesystem path.""" - anchor, parts = _explode_path(self) - if anchor: - parts.append(anchor) - return tuple(reversed(parts)) - - def joinpath(self, *pathsegments): - """Combine this path with one or several arguments, and return a - new path representing either a subpath (if all arguments are relative - paths) or a totally different path (if one of the arguments is - anchored). - """ - return self.with_segments(str(self), *pathsegments) - - def __truediv__(self, key): - try: - return self.with_segments(str(self), key) - except TypeError: - return NotImplemented - - def __rtruediv__(self, key): - try: - return self.with_segments(key, str(self)) - except TypeError: - return NotImplemented - - @property - def parent(self): - """The logical parent of the path.""" - path = str(self) - parent = self.parser.split(path)[0] - if path != parent: - return self.with_segments(parent) - return self - - @property - def parents(self): - """A sequence of this path's logical parents.""" - split = self.parser.split - path = str(self) - parent = split(path)[0] - parents = [] - while path != parent: - parents.append(self.with_segments(parent)) - path = parent - parent = split(path)[0] - return tuple(parents) - - def full_match(self, pattern, *, case_sensitive=None): - """ - Return True if this path matches the given glob-style pattern. The - pattern is matched against the entire path. - """ - if not hasattr(pattern, 'with_segments'): - pattern = self.with_segments(pattern) - if case_sensitive is None: - case_sensitive = self.parser.normcase('Aa') == 'Aa' - globber = _PathGlobber(pattern.parser.sep, case_sensitive, recursive=True) - match = globber.compile(str(pattern)) - return match(str(self)) is not None - - -class ReadablePath(JoinablePath): - """Abstract base class for readable path objects. - - The Path class implements this ABC for local filesystem paths. Users may - create subclasses to implement readable virtual filesystem paths, such as - paths in archive files or on remote storage systems. - """ - __slots__ = () - - @property - @abstractmethod - def info(self): - """ - A PathInfo object that exposes the file type and other file attributes - of this path. - """ - raise NotImplementedError - - @abstractmethod - def __open_rb__(self, buffering=-1): - """ - Open the file pointed to by this path for reading in binary mode and - return a file object, like open(mode='rb'). - """ - raise NotImplementedError - - def read_bytes(self): - """ - Open the file in bytes mode, read it, and close the file. - """ - with magic_open(self, mode='rb', buffering=0) as f: - return f.read() - - def read_text(self, encoding=None, errors=None, newline=None): - """ - Open the file in text mode, read it, and close the file. - """ - with magic_open(self, mode='r', encoding=encoding, errors=errors, newline=newline) as f: - return f.read() - - @abstractmethod - def iterdir(self): - """Yield path objects of the directory contents. - - The children are yielded in arbitrary order, and the - special entries '.' and '..' are not included. - """ - raise NotImplementedError - - def glob(self, pattern, *, case_sensitive=None, recurse_symlinks=True): - """Iterate over this subtree and yield all existing files (of any - kind, including directories) matching the given relative pattern. - """ - if not hasattr(pattern, 'with_segments'): - pattern = self.with_segments(pattern) - anchor, parts = _explode_path(pattern) - if anchor: - raise NotImplementedError("Non-relative patterns are unsupported") - case_sensitive_default = self.parser.normcase('Aa') == 'Aa' - if case_sensitive is None: - case_sensitive = case_sensitive_default - case_pedantic = False - else: - case_pedantic = case_sensitive_default != case_sensitive - recursive = True if recurse_symlinks else _no_recurse_symlinks - globber = _PathGlobber(self.parser.sep, case_sensitive, case_pedantic, recursive) - select = globber.selector(parts) - return select(self.joinpath('')) - - def walk(self, top_down=True, on_error=None, follow_symlinks=False): - """Walk the directory tree from this directory, similar to os.walk().""" - paths = [self] - while paths: - path = paths.pop() - if isinstance(path, tuple): - yield path - continue - dirnames = [] - filenames = [] - if not top_down: - paths.append((path, dirnames, filenames)) - try: - for child in path.iterdir(): - if child.info.is_dir(follow_symlinks=follow_symlinks): - if not top_down: - paths.append(child) - dirnames.append(child.name) - else: - filenames.append(child.name) - except OSError as error: - if on_error is not None: - on_error(error) - if not top_down: - while not isinstance(paths.pop(), tuple): - pass - continue - if top_down: - yield path, dirnames, filenames - paths += [path.joinpath(d) for d in reversed(dirnames)] - - @abstractmethod - def readlink(self): - """ - Return the path to which the symbolic link points. - """ - raise NotImplementedError - - def copy(self, target, follow_symlinks=True, preserve_metadata=False): - """ - Recursively copy this file or directory tree to the given destination. - """ - if not hasattr(target, 'with_segments'): - target = self.with_segments(target) - ensure_distinct_paths(self, target) - copy_file(self, target, follow_symlinks, preserve_metadata) - return target.joinpath() # Empty join to ensure fresh metadata. - - def copy_into(self, target_dir, *, follow_symlinks=True, - preserve_metadata=False): - """ - Copy this file or directory tree into the given existing directory. - """ - name = self.name - if not name: - raise ValueError(f"{self!r} has an empty name") - elif hasattr(target_dir, 'with_segments'): - target = target_dir / name - else: - target = self.with_segments(target_dir, name) - return self.copy(target, follow_symlinks=follow_symlinks, - preserve_metadata=preserve_metadata) - - -class WritablePath(JoinablePath): - """Abstract base class for writable path objects. - - The Path class implements this ABC for local filesystem paths. Users may - create subclasses to implement writable virtual filesystem paths, such as - paths in archive files or on remote storage systems. - """ - __slots__ = () - - @abstractmethod - def symlink_to(self, target, target_is_directory=False): - """ - Make this path a symlink pointing to the target path. - Note the order of arguments (link, target) is the reverse of os.symlink. - """ - raise NotImplementedError - - @abstractmethod - def mkdir(self): - """ - Create a new directory at this given path. - """ - raise NotImplementedError - - @abstractmethod - def __open_wb__(self, buffering=-1): - """ - Open the file pointed to by this path for writing in binary mode and - return a file object, like open(mode='wb'). - """ - raise NotImplementedError - - def write_bytes(self, data): - """ - Open the file in bytes mode, write to it, and close the file. - """ - # type-check for the buffer interface before truncating the file - view = memoryview(data) - with magic_open(self, mode='wb') as f: - return f.write(view) - - def write_text(self, data, encoding=None, errors=None, newline=None): - """ - Open the file in text mode, write to it, and close the file. - """ - if not isinstance(data, str): - raise TypeError('data must be str, not %s' % - data.__class__.__name__) - with magic_open(self, mode='w', encoding=encoding, errors=errors, newline=newline) as f: - return f.write(data) - - def _write_info(self, info, follow_symlinks=True): - """ - Write the given PathInfo to this path. - """ - pass - - -JoinablePath.register(PurePath) -ReadablePath.register(Path) -WritablePath.register(Path) diff --git a/Lib/pathlib/types.py b/Lib/pathlib/types.py index b781264796bf67..cfdbc89644a24a 100644 --- a/Lib/pathlib/types.py +++ b/Lib/pathlib/types.py @@ -1,9 +1,39 @@ """ Protocols for supporting classes in pathlib. """ + +# This module also provides abstract base classes for rich path objects. +# These ABCs are a *private* part of the Python standard library, but they're +# made available as a PyPI package called "pathlib-abc". It's possible they'll +# become an official part of the standard library in future. +# +# Three ABCs are provided -- _JoinablePath, _ReadablePath and _WritablePath + + +from abc import ABC, abstractmethod +from glob import _PathGlobber, _no_recurse_symlinks +from pathlib import PurePath, Path +from pathlib._os import magic_open, ensure_distinct_paths, copy_file from typing import Protocol, runtime_checkable +def _explode_path(path): + """ + Split the path into a 2-tuple (anchor, parts), where *anchor* is the + uppermost parent of the path (equivalent to path.parents[-1]), and + *parts* is a reversed list of parts following the anchor. + """ + split = path.parser.split + path = str(path) + parent, name = split(path) + names = [] + while path != parent: + names.append(name) + path = parent + parent, name = split(path) + return path, names + + @runtime_checkable class _PathParser(Protocol): """Protocol for path parsers, which do low-level path manipulation. @@ -28,3 +58,366 @@ def exists(self, *, follow_symlinks: bool = True) -> bool: ... def is_dir(self, *, follow_symlinks: bool = True) -> bool: ... def is_file(self, *, follow_symlinks: bool = True) -> bool: ... def is_symlink(self) -> bool: ... + + +class _JoinablePath(ABC): + """Abstract base class for pure path objects. + + This class *does not* provide several magic methods that are defined in + its implementation PurePath. They are: __init__, __fspath__, __bytes__, + __reduce__, __hash__, __eq__, __lt__, __le__, __gt__, __ge__. + """ + __slots__ = () + + @property + @abstractmethod + def parser(self): + """Implementation of pathlib._types.Parser used for low-level path + parsing and manipulation. + """ + raise NotImplementedError + + @abstractmethod + def with_segments(self, *pathsegments): + """Construct a new path object from any number of path-like objects. + Subclasses may override this method to customize how new path objects + are created from methods like `iterdir()`. + """ + raise NotImplementedError + + @abstractmethod + def __str__(self): + """Return the string representation of the path, suitable for + passing to system calls.""" + raise NotImplementedError + + @property + def anchor(self): + """The concatenation of the drive and root, or ''.""" + return _explode_path(self)[0] + + @property + def name(self): + """The final path component, if any.""" + return self.parser.split(str(self))[1] + + @property + def suffix(self): + """ + The final component's last suffix, if any. + + This includes the leading period. For example: '.txt' + """ + return self.parser.splitext(self.name)[1] + + @property + def suffixes(self): + """ + A list of the final component's suffixes, if any. + + These include the leading periods. For example: ['.tar', '.gz'] + """ + split = self.parser.splitext + stem, suffix = split(self.name) + suffixes = [] + while suffix: + suffixes.append(suffix) + stem, suffix = split(stem) + return suffixes[::-1] + + @property + def stem(self): + """The final path component, minus its last suffix.""" + return self.parser.splitext(self.name)[0] + + def with_name(self, name): + """Return a new path with the file name changed.""" + split = self.parser.split + if split(name)[0]: + raise ValueError(f"Invalid name {name!r}") + return self.with_segments(split(str(self))[0], name) + + def with_stem(self, stem): + """Return a new path with the stem changed.""" + suffix = self.suffix + if not suffix: + return self.with_name(stem) + elif not stem: + # If the suffix is non-empty, we can't make the stem empty. + raise ValueError(f"{self!r} has a non-empty suffix") + else: + return self.with_name(stem + suffix) + + def with_suffix(self, suffix): + """Return a new path with the file suffix changed. If the path + has no suffix, add given suffix. If the given suffix is an empty + string, remove the suffix from the path. + """ + stem = self.stem + if not stem: + # If the stem is empty, we can't make the suffix non-empty. + raise ValueError(f"{self!r} has an empty name") + elif suffix and not suffix.startswith('.'): + raise ValueError(f"Invalid suffix {suffix!r}") + else: + return self.with_name(stem + suffix) + + @property + def parts(self): + """An object providing sequence-like access to the + components in the filesystem path.""" + anchor, parts = _explode_path(self) + if anchor: + parts.append(anchor) + return tuple(reversed(parts)) + + def joinpath(self, *pathsegments): + """Combine this path with one or several arguments, and return a + new path representing either a subpath (if all arguments are relative + paths) or a totally different path (if one of the arguments is + anchored). + """ + return self.with_segments(str(self), *pathsegments) + + def __truediv__(self, key): + try: + return self.with_segments(str(self), key) + except TypeError: + return NotImplemented + + def __rtruediv__(self, key): + try: + return self.with_segments(key, str(self)) + except TypeError: + return NotImplemented + + @property + def parent(self): + """The logical parent of the path.""" + path = str(self) + parent = self.parser.split(path)[0] + if path != parent: + return self.with_segments(parent) + return self + + @property + def parents(self): + """A sequence of this path's logical parents.""" + split = self.parser.split + path = str(self) + parent = split(path)[0] + parents = [] + while path != parent: + parents.append(self.with_segments(parent)) + path = parent + parent = split(path)[0] + return tuple(parents) + + def full_match(self, pattern, *, case_sensitive=None): + """ + Return True if this path matches the given glob-style pattern. The + pattern is matched against the entire path. + """ + if not hasattr(pattern, 'with_segments'): + pattern = self.with_segments(pattern) + if case_sensitive is None: + case_sensitive = self.parser.normcase('Aa') == 'Aa' + globber = _PathGlobber(pattern.parser.sep, case_sensitive, recursive=True) + match = globber.compile(str(pattern)) + return match(str(self)) is not None + + +class _ReadablePath(_JoinablePath): + """Abstract base class for readable path objects. + + The Path class implements this ABC for local filesystem paths. Users may + create subclasses to implement readable virtual filesystem paths, such as + paths in archive files or on remote storage systems. + """ + __slots__ = () + + @property + @abstractmethod + def info(self): + """ + A PathInfo object that exposes the file type and other file attributes + of this path. + """ + raise NotImplementedError + + @abstractmethod + def __open_rb__(self, buffering=-1): + """ + Open the file pointed to by this path for reading in binary mode and + return a file object, like open(mode='rb'). + """ + raise NotImplementedError + + def read_bytes(self): + """ + Open the file in bytes mode, read it, and close the file. + """ + with magic_open(self, mode='rb', buffering=0) as f: + return f.read() + + def read_text(self, encoding=None, errors=None, newline=None): + """ + Open the file in text mode, read it, and close the file. + """ + with magic_open(self, mode='r', encoding=encoding, errors=errors, newline=newline) as f: + return f.read() + + @abstractmethod + def iterdir(self): + """Yield path objects of the directory contents. + + The children are yielded in arbitrary order, and the + special entries '.' and '..' are not included. + """ + raise NotImplementedError + + def glob(self, pattern, *, case_sensitive=None, recurse_symlinks=True): + """Iterate over this subtree and yield all existing files (of any + kind, including directories) matching the given relative pattern. + """ + if not hasattr(pattern, 'with_segments'): + pattern = self.with_segments(pattern) + anchor, parts = _explode_path(pattern) + if anchor: + raise NotImplementedError("Non-relative patterns are unsupported") + case_sensitive_default = self.parser.normcase('Aa') == 'Aa' + if case_sensitive is None: + case_sensitive = case_sensitive_default + case_pedantic = False + else: + case_pedantic = case_sensitive_default != case_sensitive + recursive = True if recurse_symlinks else _no_recurse_symlinks + globber = _PathGlobber(self.parser.sep, case_sensitive, case_pedantic, recursive) + select = globber.selector(parts) + return select(self.joinpath('')) + + def walk(self, top_down=True, on_error=None, follow_symlinks=False): + """Walk the directory tree from this directory, similar to os.walk().""" + paths = [self] + while paths: + path = paths.pop() + if isinstance(path, tuple): + yield path + continue + dirnames = [] + filenames = [] + if not top_down: + paths.append((path, dirnames, filenames)) + try: + for child in path.iterdir(): + if child.info.is_dir(follow_symlinks=follow_symlinks): + if not top_down: + paths.append(child) + dirnames.append(child.name) + else: + filenames.append(child.name) + except OSError as error: + if on_error is not None: + on_error(error) + if not top_down: + while not isinstance(paths.pop(), tuple): + pass + continue + if top_down: + yield path, dirnames, filenames + paths += [path.joinpath(d) for d in reversed(dirnames)] + + @abstractmethod + def readlink(self): + """ + Return the path to which the symbolic link points. + """ + raise NotImplementedError + + def copy(self, target, follow_symlinks=True, preserve_metadata=False): + """ + Recursively copy this file or directory tree to the given destination. + """ + if not hasattr(target, 'with_segments'): + target = self.with_segments(target) + ensure_distinct_paths(self, target) + copy_file(self, target, follow_symlinks, preserve_metadata) + return target.joinpath() # Empty join to ensure fresh metadata. + + def copy_into(self, target_dir, *, follow_symlinks=True, + preserve_metadata=False): + """ + Copy this file or directory tree into the given existing directory. + """ + name = self.name + if not name: + raise ValueError(f"{self!r} has an empty name") + elif hasattr(target_dir, 'with_segments'): + target = target_dir / name + else: + target = self.with_segments(target_dir, name) + return self.copy(target, follow_symlinks=follow_symlinks, + preserve_metadata=preserve_metadata) + + +class _WritablePath(_JoinablePath): + """Abstract base class for writable path objects. + + The Path class implements this ABC for local filesystem paths. Users may + create subclasses to implement writable virtual filesystem paths, such as + paths in archive files or on remote storage systems. + """ + __slots__ = () + + @abstractmethod + def symlink_to(self, target, target_is_directory=False): + """ + Make this path a symlink pointing to the target path. + Note the order of arguments (link, target) is the reverse of os.symlink. + """ + raise NotImplementedError + + @abstractmethod + def mkdir(self): + """ + Create a new directory at this given path. + """ + raise NotImplementedError + + @abstractmethod + def __open_wb__(self, buffering=-1): + """ + Open the file pointed to by this path for writing in binary mode and + return a file object, like open(mode='wb'). + """ + raise NotImplementedError + + def write_bytes(self, data): + """ + Open the file in bytes mode, write to it, and close the file. + """ + # type-check for the buffer interface before truncating the file + view = memoryview(data) + with magic_open(self, mode='wb') as f: + return f.write(view) + + def write_text(self, data, encoding=None, errors=None, newline=None): + """ + Open the file in text mode, write to it, and close the file. + """ + if not isinstance(data, str): + raise TypeError('data must be str, not %s' % + data.__class__.__name__) + with magic_open(self, mode='w', encoding=encoding, errors=errors, newline=newline) as f: + return f.write(data) + + def _write_info(self, info, follow_symlinks=True): + """ + Write the given PathInfo to this path. + """ + pass + + +_JoinablePath.register(PurePath) +_ReadablePath.register(Path) +_WritablePath.register(Path) diff --git a/Lib/test/test_pathlib/test_pathlib.py b/Lib/test/test_pathlib/test_pathlib.py index 4bb62daecb6356..830bfa4ca78138 100644 --- a/Lib/test/test_pathlib/test_pathlib.py +++ b/Lib/test/test_pathlib/test_pathlib.py @@ -1059,14 +1059,14 @@ def tempdir(self): return d def test_matches_writablepath_docstrings(self): - path_names = {name for name in dir(pathlib._abc.WritablePath) if name[0] != '_'} + path_names = {name for name in dir(pathlib.types._WritablePath) if name[0] != '_'} for attr_name in path_names: if attr_name == 'parser': # On Windows, Path.parser is ntpath, but WritablePath.parser is # posixpath, and so their docstrings differ. continue our_attr = getattr(self.cls, attr_name) - path_attr = getattr(pathlib._abc.WritablePath, attr_name) + path_attr = getattr(pathlib.types._WritablePath, attr_name) self.assertEqual(our_attr.__doc__, path_attr.__doc__) def test_concrete_class(self): diff --git a/Lib/test/test_pathlib/test_pathlib_abc.py b/Lib/test/test_pathlib/test_pathlib_abc.py index 1c1797ff04f653..dea16e6351265f 100644 --- a/Lib/test/test_pathlib/test_pathlib_abc.py +++ b/Lib/test/test_pathlib/test_pathlib_abc.py @@ -4,8 +4,8 @@ import errno import unittest -from pathlib._abc import JoinablePath, ReadablePath, WritablePath, magic_open -from pathlib.types import _PathParser, PathInfo +from pathlib._os import magic_open +from pathlib.types import _PathParser, PathInfo, _JoinablePath, _ReadablePath, _WritablePath import posixpath from test.support.os_helper import TESTFN @@ -31,7 +31,7 @@ def needs_windows(fn): # -class DummyJoinablePath(JoinablePath): +class DummyJoinablePath(_JoinablePath): __slots__ = ('_segments',) parser = posixpath @@ -78,7 +78,7 @@ def setUp(self): def test_is_joinable(self): p = self.cls(self.base) - self.assertIsInstance(p, JoinablePath) + self.assertIsInstance(p, _JoinablePath) def test_parser(self): self.assertIsInstance(self.cls.parser, _PathParser) @@ -855,7 +855,7 @@ def is_symlink(self): return False -class DummyReadablePath(ReadablePath, DummyJoinablePath): +class DummyReadablePath(_ReadablePath, DummyJoinablePath): """ Simple implementation of DummyReadablePath that keeps files and directories in memory. @@ -900,7 +900,7 @@ def readlink(self): raise NotImplementedError -class DummyWritablePath(WritablePath, DummyJoinablePath): +class DummyWritablePath(_WritablePath, DummyJoinablePath): __slots__ = () def __open_wb__(self, buffering=-1): @@ -999,7 +999,7 @@ def assertEqualNormCase(self, path_a, path_b): def test_is_readable(self): p = self.cls(self.base) - self.assertIsInstance(p, ReadablePath) + self.assertIsInstance(p, _ReadablePath) def test_magic_open(self): p = self.cls(self.base) @@ -1130,7 +1130,7 @@ def test_info_exists_caching(self): q = p / 'myfile' self.assertFalse(q.info.exists()) self.assertFalse(q.info.exists(follow_symlinks=False)) - if isinstance(self.cls, WritablePath): + if isinstance(self.cls, _WritablePath): q.write_text('hullo') self.assertFalse(q.info.exists()) self.assertFalse(q.info.exists(follow_symlinks=False)) @@ -1162,7 +1162,7 @@ def test_info_is_dir_caching(self): q = p / 'mydir' self.assertFalse(q.info.is_dir()) self.assertFalse(q.info.is_dir(follow_symlinks=False)) - if isinstance(self.cls, WritablePath): + if isinstance(self.cls, _WritablePath): q.mkdir() self.assertFalse(q.info.is_dir()) self.assertFalse(q.info.is_dir(follow_symlinks=False)) @@ -1194,7 +1194,7 @@ def test_info_is_file_caching(self): q = p / 'myfile' self.assertFalse(q.info.is_file()) self.assertFalse(q.info.is_file(follow_symlinks=False)) - if isinstance(self.cls, WritablePath): + if isinstance(self.cls, _WritablePath): q.write_text('hullo') self.assertFalse(q.info.is_file()) self.assertFalse(q.info.is_file(follow_symlinks=False)) @@ -1220,7 +1220,7 @@ class WritablePathTest(JoinablePathTest): def test_is_writable(self): p = self.cls(self.base) - self.assertIsInstance(p, WritablePath) + self.assertIsInstance(p, _WritablePath) class DummyRWPath(DummyWritablePath, DummyReadablePath):

1 0

gh-130453: pygettext: Allow overriding default keywords when using `--keyword` (GH-130709)
by serhiy-storchaka March 3, 2025

March 3, 2025

https://github.com/python/cpython/commit/321bf595121f9327368af8bf5e850d9d14… commit: 321bf595121f9327368af8bf5e850d9d145360c2 branch: main author: Tomas R. <tomas.roun8(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2025-03-03T18:57:01+02:00 summary: gh-130453: pygettext: Allow overriding default keywords when using `--keyword` (GH-130709) files: A Misc/NEWS.d/next/Tools-Demos/2025-02-28-23-24-03.gh-issue-130453.EK0Vk_.rst M Lib/test/test_tools/i18n_data/custom_keywords.pot M Lib/test/test_tools/i18n_data/custom_keywords.py M Lib/test/test_tools/test_i18n.py M Tools/i18n/pygettext.py diff --git a/Lib/test/test_tools/i18n_data/custom_keywords.pot b/Lib/test/test_tools/i18n_data/custom_keywords.pot index 48df2e7f579cc7..03a9cba3a20b16 100644 --- a/Lib/test/test_tools/i18n_data/custom_keywords.pot +++ b/Lib/test/test_tools/i18n_data/custom_keywords.pot @@ -15,31 +15,37 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: custom_keywords.py:9 custom_keywords.py:10 +#: custom_keywords.py:10 custom_keywords.py:11 msgid "bar" msgstr "" -#: custom_keywords.py:12 +#: custom_keywords.py:13 msgid "cat" msgid_plural "cats" msgstr[0] "" msgstr[1] "" -#: custom_keywords.py:13 +#: custom_keywords.py:14 msgid "dog" msgid_plural "dogs" msgstr[0] "" msgstr[1] "" -#: custom_keywords.py:15 +#: custom_keywords.py:16 msgctxt "context" msgid "bar" msgstr "" -#: custom_keywords.py:17 +#: custom_keywords.py:18 msgctxt "context" msgid "cat" msgid_plural "cats" msgstr[0] "" msgstr[1] "" +#: custom_keywords.py:34 +msgid "overridden" +msgid_plural "default" +msgstr[0] "" +msgstr[1] "" + diff --git a/Lib/test/test_tools/i18n_data/custom_keywords.py b/Lib/test/test_tools/i18n_data/custom_keywords.py index 01ea56c348cb55..ba0ffe77180478 100644 --- a/Lib/test/test_tools/i18n_data/custom_keywords.py +++ b/Lib/test/test_tools/i18n_data/custom_keywords.py @@ -4,6 +4,7 @@ pgettext as pfoo, npgettext as npfoo, gettext as bar, + gettext as _, ) foo('bar') @@ -28,3 +29,6 @@ # 'npfoo' requires at least 3 arguments npfoo('context') npfoo('context', 'cat') + +# --keyword should override the default keyword +_('overridden', 'default') diff --git a/Lib/test/test_tools/test_i18n.py b/Lib/test/test_tools/test_i18n.py index d73fcff4c9cb11..2ba086109d30ab 100644 --- a/Lib/test/test_tools/test_i18n.py +++ b/Lib/test/test_tools/test_i18n.py @@ -525,7 +525,7 @@ def extract_from_snapshots(): 'comments.py': ('--add-comments=i18n:',), 'custom_keywords.py': ('--keyword=foo', '--keyword=nfoo:1,2', '--keyword=pfoo:1c,2', - '--keyword=npfoo:1c,2,3'), + '--keyword=npfoo:1c,2,3', '--keyword=_:1,2'), } for filename, args in snapshots.items(): diff --git a/Misc/NEWS.d/next/Tools-Demos/2025-02-28-23-24-03.gh-issue-130453.EK0Vk_.rst b/Misc/NEWS.d/next/Tools-Demos/2025-02-28-23-24-03.gh-issue-130453.EK0Vk_.rst new file mode 100644 index 00000000000000..684fd9ab0c3455 --- /dev/null +++ b/Misc/NEWS.d/next/Tools-Demos/2025-02-28-23-24-03.gh-issue-130453.EK0Vk_.rst @@ -0,0 +1 @@ +Make it possible to override default keywords in :program:`pygettext`. diff --git a/Tools/i18n/pygettext.py b/Tools/i18n/pygettext.py index 0f5f32c7d6c18f..0ec257020918b1 100755 --- a/Tools/i18n/pygettext.py +++ b/Tools/i18n/pygettext.py @@ -729,12 +729,15 @@ class Options: # calculate all keywords try: - options.keywords = dict(parse_spec(spec) for spec in options.keywords) + custom_keywords = dict(parse_spec(spec) for spec in options.keywords) except ValueError as e: print(e, file=sys.stderr) sys.exit(1) + options.keywords = {} if not no_default_keywords: options.keywords |= DEFAULTKEYWORDS + # custom keywords override default keywords + options.keywords |= custom_keywords # initialize list of strings to exclude if options.excludefilename:

1 0

[3.13] gh-128388: pyrepl on Windows: add meta and ctrl+arrow keybindings (GH-128389) (GH-130500)
by encukou March 3, 2025

March 3, 2025

https://github.com/python/cpython/commit/4c6318e24ddd6a4aeb243c064055a38823… commit: 4c6318e24ddd6a4aeb243c064055a38823a142bb branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: encukou <encukou(a)gmail.com> date: 2025-03-03T16:57:53+01:00 summary: [3.13] gh-128388: pyrepl on Windows: add meta and ctrl+arrow keybindings (GH-128389) (GH-130500) gh-128388: pyrepl on Windows: add meta and ctrl+arrow keybindings (GH-128389) Fix `Lib/_pyrepl/windows_console.py` to support more keybindings, like the `Ctrl`+`←` and `Ctrl`+`→` word-skipping keybindings and those with meta (i.e. Alt), e.g. to `kill-word` or `backward-kill-word`. Specifics: if Ctrl is pressed, emit "ctrl left" and "ctrl right" instead of just "left" or "right," and if Meta/Alt is pressed, emit the special key code for meta before emitting the other key that was pressed. (cherry picked from commit 688f3a0d4b94874ff6d72af3baafd8bbf911153e) Co-authored-by: Paulie Peña <203125+paulie4(a)users.noreply.github.com> Co-authored-by: Hugo van Kemenade <1324225+hugovk(a)users.noreply.github.com> Co-authored-by: Pieter Eendebak <pieter.eendebak(a)gmail.com> files: A Misc/NEWS.d/next/Library/2025-01-01-19-24-43.gh-issue-128388.8UdMz_.rst M Lib/_pyrepl/windows_console.py diff --git a/Lib/_pyrepl/windows_console.py b/Lib/_pyrepl/windows_console.py index fffadd5e2ec28e..48f328e4de3ce3 100644 --- a/Lib/_pyrepl/windows_console.py +++ b/Lib/_pyrepl/windows_console.py @@ -102,6 +102,10 @@ def __init__(self, err: int | None, descr: str | None = None) -> None: MOVE_DOWN = "\x1b[{}B" CLEAR = "\x1b[H\x1b[J" +# State of control keys: https://learn.microsoft.com/en-us/windows/console/key-event-record-str +ALT_ACTIVE = 0x01 | 0x02 +CTRL_ACTIVE = 0x04 | 0x08 + class _error(Exception): pass @@ -407,31 +411,37 @@ def get_event(self, block: bool = True) -> Event | None: continue return None - key = rec.Event.KeyEvent.uChar.UnicodeChar + key_event = rec.Event.KeyEvent + raw_key = key = key_event.uChar.UnicodeChar - if rec.Event.KeyEvent.uChar.UnicodeChar == "\r": - # Make enter make unix-like + if key == "\r": + # Make enter unix-like return Event(evt="key", data="\n", raw=b"\n") - elif rec.Event.KeyEvent.wVirtualKeyCode == 8: + elif key_event.wVirtualKeyCode == 8: # Turn backspace directly into the command - return Event( - evt="key", - data="backspace", - raw=rec.Event.KeyEvent.uChar.UnicodeChar, - ) - elif rec.Event.KeyEvent.uChar.UnicodeChar == "\x00": + key = "backspace" + elif key == "\x00": # Handle special keys like arrow keys and translate them into the appropriate command - code = VK_MAP.get(rec.Event.KeyEvent.wVirtualKeyCode) - if code: - return Event( - evt="key", data=code, raw=rec.Event.KeyEvent.uChar.UnicodeChar - ) + key = VK_MAP.get(key_event.wVirtualKeyCode) + if key: + if key_event.dwControlKeyState & CTRL_ACTIVE: + key = f"ctrl {key}" + elif key_event.dwControlKeyState & ALT_ACTIVE: + # queue the key, return the meta command + self.event_queue.insert(0, Event(evt="key", data=key, raw=key)) + return Event(evt="key", data="\033") # keymap.py uses this for meta + return Event(evt="key", data=key, raw=key) if block: continue return None - return Event(evt="key", data=key, raw=rec.Event.KeyEvent.uChar.UnicodeChar) + if key_event.dwControlKeyState & ALT_ACTIVE: + # queue the key, return the meta command + self.event_queue.insert(0, Event(evt="key", data=key, raw=raw_key)) + return Event(evt="key", data="\033") # keymap.py uses this for meta + + return Event(evt="key", data=key, raw=raw_key) def push_char(self, char: int | bytes) -> None: """ diff --git a/Misc/NEWS.d/next/Library/2025-01-01-19-24-43.gh-issue-128388.8UdMz_.rst b/Misc/NEWS.d/next/Library/2025-01-01-19-24-43.gh-issue-128388.8UdMz_.rst new file mode 100644 index 00000000000000..5bef0fd6bcac17 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-01-01-19-24-43.gh-issue-128388.8UdMz_.rst @@ -0,0 +1 @@ +Fix ``PyREPL`` on Windows to support more keybindings, like the :kbd:`Control-←` and :kbd:`Control-→` word-skipping keybindings and those with meta (i.e. :kbd:`Alt`), e.g. :kbd:`Alt-d` to ``kill-word`` or :kbd:`Alt-Backspace` ``backward-kill-word``.

1 0

[3.12] gh-129583: update bundled pip to 25.0.1 (GH-129909) (#129947)
by hugovk March 3, 2025

March 3, 2025

https://github.com/python/cpython/commit/3614649714a15c9b810e7697ed625662f0… commit: 3614649714a15c9b810e7697ed625662f0b164bd branch: 3.12 author: Hugo van Kemenade <1324225+hugovk(a)users.noreply.github.com> committer: hugovk <1324225+hugovk(a)users.noreply.github.com> date: 2025-03-03T17:46:07+02:00 summary: [3.12] gh-129583: update bundled pip to 25.0.1 (GH-129909) (#129947) (cherry picked from commit b8f7bddd6c6b5d2d13c97882042ce808aceca5a8) Co-authored-by: Stéphane Bidoul <stephane.bidoul(a)gmail.com> Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot](a)users.noreply.github.com> files: A Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl A Misc/NEWS.d/next/Library/2025-02-09-17-47-01.gh-issue-129583.-130Ys.rst D Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl M Lib/ensurepip/__init__.py diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py index 35d04d2f8b8d7f..f827afa4646c4a 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -10,7 +10,7 @@ __all__ = ["version", "bootstrap"] _PACKAGE_NAMES = ('pip',) -_PIP_VERSION = "24.3.1" +_PIP_VERSION = "25.0.1" _PROJECTS = [ ("pip", _PIP_VERSION, "py3"), ] diff --git a/Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl b/Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl similarity index 75% rename from Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl rename to Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl index 5f1d35be6dd56b..8d3b0043ea5379 100644 Binary files a/Lib/ensurepip/_bundled/pip-24.3.1-py3-none-any.whl and b/Lib/ensurepip/_bundled/pip-25.0.1-py3-none-any.whl differ diff --git a/Misc/NEWS.d/next/Library/2025-02-09-17-47-01.gh-issue-129583.-130Ys.rst b/Misc/NEWS.d/next/Library/2025-02-09-17-47-01.gh-issue-129583.-130Ys.rst new file mode 100644 index 00000000000000..9f24a83df12dd3 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-02-09-17-47-01.gh-issue-129583.-130Ys.rst @@ -0,0 +1 @@ +Update bundled pip to 25.0.1

1 0

[3.13] gh-130379: Fix incorrect zipapp logic to avoid including the target in itself (gh-130509) (gh-130791)
by pfmoore March 3, 2025

March 3, 2025

https://github.com/python/cpython/commit/bc5c2b857330dc077986b9745d7c18415d… commit: bc5c2b857330dc077986b9745d7c18415db9d3af branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: pfmoore <p.f.moore(a)gmail.com> date: 2025-03-03T15:20:05Z summary: [3.13] gh-130379: Fix incorrect zipapp logic to avoid including the target in itself (gh-130509) (gh-130791) gh-130379: Fix incorrect zipapp logic to avoid including the target in itself (gh-130509) (cherry picked from commit 64ccbbbf367c7510090a6f5faf826a21102a8bc6) Co-authored-by: Paul Moore <p.f.moore(a)gmail.com> files: A Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst M Lib/test/test_zipapp.py M Lib/zipapp.py diff --git a/Lib/test/test_zipapp.py b/Lib/test/test_zipapp.py index 00a5ed6626ddc5..ad132839622f48 100644 --- a/Lib/test/test_zipapp.py +++ b/Lib/test/test_zipapp.py @@ -89,6 +89,30 @@ def skip_pyc_files(path): self.assertIn('test.py', z.namelist()) self.assertNotIn('test.pyc', z.namelist()) + def test_create_archive_self_insertion(self): + # When creating an archive, we shouldn't + # include the archive in the list of files to add. + source = self.tmpdir + (source / '__main__.py').touch() + (source / 'test.py').touch() + target = self.tmpdir / 'target.pyz' + + zipapp.create_archive(source, target) + with zipfile.ZipFile(target, 'r') as z: + self.assertEqual(len(z.namelist()), 2) + self.assertIn('__main__.py', z.namelist()) + self.assertIn('test.py', z.namelist()) + + def test_target_overwrites_source_file(self): + # The target cannot be one of the files to add. + source = self.tmpdir + (source / '__main__.py').touch() + target = source / 'target.pyz' + target.touch() + + with self.assertRaises(zipapp.ZipAppError): + zipapp.create_archive(source, target) + def test_create_archive_filter_exclude_dir(self): # Test packing a directory and using a filter to exclude a # subdirectory (ensures that the path supplied to include diff --git a/Lib/zipapp.py b/Lib/zipapp.py index 03a214efa10a20..4ffacc49fa753d 100644 --- a/Lib/zipapp.py +++ b/Lib/zipapp.py @@ -131,14 +131,37 @@ def create_archive(source, target=None, interpreter=None, main=None, elif not hasattr(target, 'write'): target = pathlib.Path(target) + # Create the list of files to add to the archive now, in case + # the target is being created in the source directory - we + # don't want the target being added to itself + files_to_add = sorted(source.rglob('*')) + + # The target cannot be in the list of files to add. If it were, we'd + # end up overwriting the source file and writing the archive into + # itself, which is an error. We therefore check for that case and + # provide a helpful message for the user. + + # Note that we only do a simple path equality check. This won't + # catch every case, but it will catch the common case where the + # source is the CWD and the target is a file in the CWD. More + # thorough checks don't provide enough value to justify the extra + # cost. + + # If target is a file-like object, it will simply fail to compare + # equal to any of the entries in files_to_add, so there's no need + # to add a special check for that. + if target in files_to_add: + raise ZipAppError( + f"The target archive {target} overwrites one of the source files.") + with _maybe_open(target, 'wb') as fd: _write_file_prefix(fd, interpreter) compression = (zipfile.ZIP_DEFLATED if compressed else zipfile.ZIP_STORED) with zipfile.ZipFile(fd, 'w', compression=compression) as z: - for child in sorted(source.rglob('*')): + for child in files_to_add: arcname = child.relative_to(source) - if filter is None or filter(arcname) and child.resolve() != arcname.resolve(): + if filter is None or filter(arcname): z.write(child, arcname.as_posix()) if main_py: z.writestr('__main__.py', main_py.encode('utf-8')) diff --git a/Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst b/Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst new file mode 100644 index 00000000000000..157b2836491c1d --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-02-24-14-46-20.gh-issue-130379.lsef7A.rst @@ -0,0 +1 @@ +The zipapp module now calculates the list of files to be added to the archive before creating the archive. This avoids accidentally including the target when it is being created in the source directory.

1 0

[3.13] Docs: Fix a misplaced statement in the document for `ServerProxy` (GH-130616) (GH-130640)
by encukou March 3, 2025

March 3, 2025

https://github.com/python/cpython/commit/57dcbfd7da8ba731f4b6ac4d5fd78e2a16… commit: 57dcbfd7da8ba731f4b6ac4d5fd78e2a1605cb56 branch: 3.13 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: encukou <encukou(a)gmail.com> date: 2025-03-03T15:09:26+01:00 summary: [3.13] Docs: Fix a misplaced statement in the document for `ServerProxy` (GH-130616) (GH-130640) Docs: Fix a misplaced statement in the document for `ServerProxy` (GH-130616) The sentence "If an HTTPS URL ..." explains what the parameter means, so moved it to the paragraph explaining what the other parameters mean. (cherry picked from commit b26286ca49d87ad8491e411f7b0283b0f15ad5be) Co-authored-by: Yuki Kobayashi <drsuaimqjgar(a)gmail.com> files: M Doc/library/xmlrpc.client.rst diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst index 971e65605841e7..654154cb43d6e5 100644 --- a/Doc/library/xmlrpc.client.rst +++ b/Doc/library/xmlrpc.client.rst @@ -61,6 +61,8 @@ between conformable Python objects and XML on the wire. The *headers* parameter is an optional sequence of HTTP headers to send with each request, expressed as a sequence of 2-tuples representing the header name and value. (e.g. ``[('Header-Name', 'value')]``). + If an HTTPS URL is provided, *context* may be :class:`ssl.SSLContext` + and configures the SSL settings of the underlying HTTPS connection. The obsolete *use_datetime* flag is similar to *use_builtin_types* but it applies only to date/time values. @@ -75,9 +77,7 @@ between conformable Python objects and XML on the wire. portion will be base64-encoded as an HTTP 'Authorization' header, and sent to the remote server as part of the connection process when invoking an XML-RPC method. You only need to use this if the remote server requires a Basic - Authentication user and password. If an HTTPS URL is provided, *context* may - be :class:`ssl.SSLContext` and configures the SSL settings of the underlying - HTTPS connection. + Authentication user and password. The returned instance is a proxy object with methods that can be used to invoke corresponding RPC calls on the remote server. If the remote server supports the

1 0

[3.12] Docs: Fix a misplaced statement in the document for `ServerProxy` (GH-130616) (GH-130639)
by encukou March 3, 2025

March 3, 2025

https://github.com/python/cpython/commit/23f11e32c2868af5360734e54f80fd1afb… commit: 23f11e32c2868af5360734e54f80fd1afb950e41 branch: 3.12 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: encukou <encukou(a)gmail.com> date: 2025-03-03T15:09:20+01:00 summary: [3.12] Docs: Fix a misplaced statement in the document for `ServerProxy` (GH-130616) (GH-130639) Docs: Fix a misplaced statement in the document for `ServerProxy` (GH-130616) The sentence "If an HTTPS URL ..." explains what the parameter means, so moved it to the paragraph explaining what the other parameters mean. (cherry picked from commit b26286ca49d87ad8491e411f7b0283b0f15ad5be) Co-authored-by: Yuki Kobayashi <drsuaimqjgar(a)gmail.com> files: M Doc/library/xmlrpc.client.rst diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst index 971e65605841e7..654154cb43d6e5 100644 --- a/Doc/library/xmlrpc.client.rst +++ b/Doc/library/xmlrpc.client.rst @@ -61,6 +61,8 @@ between conformable Python objects and XML on the wire. The *headers* parameter is an optional sequence of HTTP headers to send with each request, expressed as a sequence of 2-tuples representing the header name and value. (e.g. ``[('Header-Name', 'value')]``). + If an HTTPS URL is provided, *context* may be :class:`ssl.SSLContext` + and configures the SSL settings of the underlying HTTPS connection. The obsolete *use_datetime* flag is similar to *use_builtin_types* but it applies only to date/time values. @@ -75,9 +77,7 @@ between conformable Python objects and XML on the wire. portion will be base64-encoded as an HTTP 'Authorization' header, and sent to the remote server as part of the connection process when invoking an XML-RPC method. You only need to use this if the remote server requires a Basic - Authentication user and password. If an HTTPS URL is provided, *context* may - be :class:`ssl.SSLContext` and configures the SSL settings of the underlying - HTTPS connection. + Authentication user and password. The returned instance is a proxy object with methods that can be used to invoke corresponding RPC calls on the remote server. If the remote server supports the

1 0