Tweaks

Author: barneygale

Lib/test/test_pathlib/support/local_path.py

@@ -82,6 +82,8 @@ class LocalPathInfo(pathlib.types.PathInfo):
     """
     Simple implementation of PathInfo for a local path
     """
+    __slots__ = ('_path', '_exists', '_is_dir', '_is_file', '_is_symlink')
+
     def __init__(self, path):
         self._path = str(path)
         self._exists = None
@@ -124,11 +126,11 @@ class ReadableLocalPath(pathlib.types._ReadablePath, LexicalPath):
     """
     Simple implementation of a ReadablePath class for local filesystem paths.
     """
-    __slots__ = ('_info')
+    __slots__ = ('info',)
 
     def __init__(self, *pathsegments):
         super().__init__(*pathsegments)
-        self._info = None
+        self.info = LocalPathInfo(self)
 
     def __fspath__(self):
         return str(self)
@@ -141,9 +143,3 @@ def iterdir(self):
 
     def readlink(self):
         return self.with_segments(os.readlink(self))
-
-    @property
-    def info(self):
-        if self._info is None:
-            self._info = LocalPathInfo(self)
-        return self._info

Lib/test/test_pathlib/support/zip_path.py

@@ -83,6 +83,7 @@ class MissingZipPathInfo:
     """
     PathInfo implementation that is used when a zip file member is missing.
     """
+    __slots__ = ()
 
     def exists(self, follow_symlinks=True):
         return False
@@ -195,12 +196,12 @@ class ZipFileList:
     tree of `ZipPathInfo` objects representing the zip file members.
     """
 
-    __slots__ = ('root', '_items')
+    __slots__ = ('tree', '_items')
 
-    def __init__(self, zip_file, items):
-        self.root = ZipPathInfo(zip_file)
+    def __init__(self, zip_file):
+        self.tree = ZipPathInfo(zip_file)
         self._items = []
-        for item in items:
+        for item in zip_file.filelist:
             self.append(item)
 
     def __len__(self):
@@ -211,7 +212,7 @@ def __iter__(self):
 
     def append(self, item):
         self._items.append(item)
-        self.root.resolve(item.filename, create=True).zip_info = item
+        self.tree.resolve(item.filename, create=True).zip_info = item
 
 
 class ReadableZipPath(pathlib.types._ReadablePath):
@@ -226,7 +227,7 @@ def __init__(self, *pathsegments, zip_file):
         self._segments = pathsegments
         self.zip_file = zip_file
         if not isinstance(zip_file.filelist, ZipFileList):
-            zip_file.filelist = ZipFileList(zip_file, zip_file.filelist)
+            zip_file.filelist = ZipFileList(zip_file)
 
     def __hash__(self):
         return hash((str(self), self.zip_file))
@@ -249,8 +250,8 @@ def with_segments(self, *pathsegments):
 
     @property
     def info(self):
-        root = self.zip_file.filelist.root
-        return root.resolve(str(self), follow_symlinks=False)
+        tree = self.zip_file.filelist.tree
+        return tree.resolve(str(self), follow_symlinks=False)
 
     def __open_rb__(self, buffering=-1):
         info = self.info.resolve()