Removed features slated for Python 3.15 only.

Author: jaraco

Lib/zipfile/_path/__init__.py

@@ -7,7 +7,7 @@
 for more detail.
 """
 
-import functools
+import contextlib
 import io
 import itertools
 import pathlib
@@ -17,10 +17,9 @@
 import sys
 import zipfile
 
-from ._functools import save_method_args
 from .glob import Translator
 
-__all__ = ['Path']
+__all__ = ["Path"]
 
 
 def _parents(path):
@@ -86,12 +85,13 @@ class InitializedState:
     Mix-in to save the initialization state for pickling.
     """
 
-    @save_method_args
     def __init__(self, *args, **kwargs):
+        self.__args = args
+        self.__kwargs = kwargs
         super().__init__(*args, **kwargs)
 
     def __getstate__(self):
-        return self._saved___init__.args, self._saved___init__.kwargs
+        return self.__args, self.__kwargs
 
     def __setstate__(self, state):
         args, kwargs = state
@@ -128,7 +128,7 @@ def resolve_dir(self, name):
         as a directory (with the trailing slash).
         """
         names = self._name_set()
-        dirname = name + '/'
+        dirname = name + "/"
         dir_match = name not in names and dirname in names
         return dirname if dir_match else name
 
@@ -139,7 +139,7 @@ def getinfo(self, name):
         try:
             return super().getinfo(name)
         except KeyError:
-            if not name.endswith('/') or name not in self._name_set():
+            if not name.endswith("/") or name not in self._name_set():
                 raise
             return zipfile.ZipInfo(filename=name)
 
@@ -156,7 +156,7 @@ def make(cls, source):
             return cls(source)
 
         # Only allow for FastLookup when supplied zipfile is read-only
-        if 'r' not in source.mode:
+        if "r" not in source.mode:
             cls = CompleteDirs
 
         source.__class__ = cls
@@ -182,21 +182,22 @@ class FastLookup(CompleteDirs):
     def namelist(self):
         return self._namelist
 
-    @functools.cached_property
-    def _namelist(self):
-        return super().namelist()
+    def namelist(self):
+        with contextlib.suppress(AttributeError):
+            return self.__names
+        self.__names = super().namelist()
+        return self.__names
 
     def _name_set(self):
-        return self._name_set_prop
-
-    @functools.cached_property
-    def _name_set_prop(self):
-        return super()._name_set()
+        with contextlib.suppress(AttributeError):
+            return self.__lookup
+        self.__lookup = super()._name_set()
+        return self.__lookup
 
 
 def _extract_text_encoding(encoding=None, *args, **kwargs):
     # compute stack level so that the caller of the caller sees any warning.
-    is_pypy = sys.implementation.name == 'pypy'
+    is_pypy = sys.implementation.name == "pypy"
     # PyPy no longer special cased after 7.3.19 (or maybe 7.3.18)
     # See jaraco/zipp#143
     is_old_pypi = is_pypy and sys.pypy_version_info < (7, 3, 19)
@@ -334,7 +335,7 @@ def __eq__(self, other):
     def __hash__(self):
         return hash((self.root, self.at))
 
-    def open(self, mode='r', *args, pwd=None, **kwargs):
+    def open(self, mode="r", *args, pwd=None, **kwargs):
         """
         Open this entry as text or binary following the semantics
         of ``pathlib.Path.open()`` by passing arguments through
@@ -343,10 +344,10 @@ def open(self, mode='r', *args, pwd=None, **kwargs):
         if self.is_dir():
             raise IsADirectoryError(self)
         zip_mode = mode[0]
-        if zip_mode == 'r' and not self.exists():
+        if zip_mode == "r" and not self.exists():
             raise FileNotFoundError(self)
         stream = self.root.open(self.at, zip_mode, pwd=pwd)
-        if 'b' in mode:
+        if "b" in mode:
             if args or kwargs:
                 raise ValueError("encoding args invalid for binary operation")
             return stream
@@ -379,11 +380,11 @@ def filename(self):
 
     def read_text(self, *args, **kwargs):
         encoding, args, kwargs = _extract_text_encoding(*args, **kwargs)
-        with self.open('r', encoding, *args, **kwargs) as strm:
+        with self.open("r", encoding, *args, **kwargs) as strm:
             return strm.read()
 
     def read_bytes(self):
-        with self.open('rb') as strm:
+        with self.open("rb") as strm:
             return strm.read()
 
     def _is_child(self, path):
@@ -423,12 +424,12 @@ def glob(self, pattern):
             raise ValueError(f"Unacceptable pattern: {pattern!r}")
 
         prefix = re.escape(self.at)
-        tr = Translator(seps='/')
+        tr = Translator(seps="/")
         matches = re.compile(prefix + tr.translate(pattern)).fullmatch
         return map(self._next, filter(matches, self.root.namelist()))
 
     def rglob(self, pattern):
-        return self.glob(f'**/{pattern}')
+        return self.glob(f"**/{pattern}")
 
     def relative_to(self, other, *extra):
         return posixpath.relpath(str(self), str(other.joinpath(*extra)))
@@ -449,7 +450,7 @@ def joinpath(self, *other):
     def parent(self):
         if not self.at:
             return self.filename.parent
-        parent_at = posixpath.dirname(self.at.rstrip('/'))
+        parent_at = posixpath.dirname(self.at.rstrip("/"))
         if parent_at:
-            parent_at += '/'
+            parent_at += "/"
         return self._next(parent_at)

Lib/zipfile/_path/_functools.py

@@ -1,6 +1,3 @@
-Synchronized zipfile.Path with zipp 3.23, including improved performance of
-:meth:`zipfile.Path.open` for non-reading modes, rely on
-:func:`functools.cached_property` to cache values on the instance. Rely on
-``save_method_args`` to save the initialization method arguments. Fixed
+Backported bugfixes in zipfile.Path from zipp 3.23. Fixed
 ``.name``, ``.stem`` and other basename-based properties on Windows when
 working with a zipfile on disk.