Overwrite _from_parts / _from_parsed_parts to call _init

- fix link_to for Python 3.10
- revert some of the probably unneeded changes

Author: mrbean-bremen

pyfakefs/fake_pathlib.py

@@ -54,8 +54,7 @@ def init_module(filesystem):
 def _wrap_strfunc(strfunc):
     @functools.wraps(strfunc)
     def _wrapped(pathobj, *args, **kwargs):
-        p = pathobj.filesystem if hasattr(pathobj, "filesystem") else pathobj
-        return strfunc(p, str(pathobj), *args, **kwargs)
+        return strfunc(pathobj.filesystem, str(pathobj), *args, **kwargs)
 
     return staticmethod(_wrapped)
 
@@ -125,23 +124,19 @@ def lchmod(self, pathobj, mode):
         FakeFilesystem.create_symlink(fs, file_path, link_target,
                                       create_missing_dirs=False))
 
-    if sys.version_info >= (3, 8):
+    if (3, 8) <= sys.version_info < (3, 10):
         link_to = _wrap_binary_strfunc(
             lambda fs, file_path, link_target:
             FakeFilesystem.link(fs, file_path, link_target))
 
-    if sys.version_info >= (3, 9):
-        readlink = _wrap_strfunc(FakeFilesystem.readlink)
-    else:
-        # why? and shouldnt this not be *os* -- but something patched (FakeOsModule probably)?
-        readlink = staticmethod(os.readlink)
-        pass
+    if sys.version_info >= (3, 10):
+        link = _wrap_binary_strfunc(
+            lambda fs, file_path, link_target:
+            FakeFilesystem.link(fs, file_path, link_target))
 
-    utime = _wrap_strfunc(FakeFilesystem.utime)
+    readlink = _wrap_strfunc(FakeFilesystem.readlink)
 
-    # same comment as above for these two
-    realpath = staticmethod(os.path.realpath)
-    getcwd = staticmethod(os.getcwd)
+    utime = _wrap_strfunc(FakeFilesystem.utime)
 
 
 _fake_accessor = _FakeAccessor()
@@ -471,15 +466,35 @@ def __new__(cls, *args, **kwargs):
                    if cls.filesystem.is_windows_fs
                    else FakePathlibModule.PosixPath)
         self = cls._from_parts(args)
+        return self
+
+    @classmethod
+    def _from_parts(cls, args, init=False):  # pylint: disable=unused-argument
+        # Overwritten to call _init to set the fake accessor,
+        # which is not done since Python 3.10
+        self = object.__new__(cls)
         self._init()
+        drv, root, parts = self._parse_args(args)
+        self._drv = drv
+        self._root = root
+        self._parts = parts
+        return self
+
+    @classmethod
+    def _from_parsed_parts(cls, drv, root, parts):
+        # Overwritten to call _init to set the fake accessor,
+        # which is not done since Python 3.10
+        self = object.__new__(cls)
+        self._init()
+        self._drv = drv
+        self._root = root
+        self._parts = parts
         return self
 
     def _init(self, template=None):
-         """Initializer called from base class."""
-         # template is an unused holdover
-         _ = template
-         self._accessor = _fake_accessor
-         self._closed = False
+        """Initializer called from base class."""
+        self._accessor = _fake_accessor
+        self._closed = False
 
     def _path(self):
         """Returns the underlying path string as used by the fake filesystem.
@@ -729,20 +744,12 @@ class RealPath(pathlib.Path):
     itself is not.
     """
 
-    def _init(self, template=None):
-         """Initializer called from base class."""
-         # template is an unused holdover
-         _ = template
-         self._accessor = _fake_accessor
-         self._closed = False
-
     def __new__(cls, *args, **kwargs):
         """Creates the correct subclass based on OS."""
         if cls is RealPathlibModule.Path:
             cls = (RealPathlibModule.WindowsPath if os.name == 'nt'
                    else RealPathlibModule.PosixPath)
         self = cls._from_parts(args)
-        self._init()
         return self
 
 

pyfakefs/tests/fake_pathlib_test.py

@@ -378,20 +378,19 @@ def test_chmod(self):
         # we get stat.S_IFLNK | 0o755 under MacOs
         self.assertEqual(link_stat.st_mode, stat.S_IFLNK | 0o777)
 
-    @unittest.skipIf(sys.platform == 'darwin',
-                     'Different behavior under MacOs')
     def test_lchmod(self):
         self.skip_if_symlink_not_supported()
         file_stat = self.os.stat(self.file_path)
         link_stat = self.os.lstat(self.file_link_path)
-        if not hasattr(os, "lchmod"):
+        if not hasattr(os, "lchmod") and sys.version_info < (3, 10):
             with self.assertRaises(NotImplementedError):
                 self.path(self.file_link_path).lchmod(0o444)
         else:
             self.path(self.file_link_path).lchmod(0o444)
             self.assertEqual(file_stat.st_mode, stat.S_IFREG | 0o666)
-            # we get stat.S_IFLNK | 0o755 under MacOs
-            self.assertEqual(link_stat.st_mode, stat.S_IFLNK | 0o444)
+            # the exact mode depends on OS and Python version
+            self.assertEqual(link_stat.st_mode & 0o777700,
+                             stat.S_IFLNK | 0o700)
 
     def test_resolve(self):
         self.create_dir(self.make_path('antoine', 'docs'))