Use is_called_from_skipped_module in fake_io and fake_open too

Author: sassanh

pyfakefs/fake_io.py

@@ -33,7 +33,7 @@
 
 from pyfakefs.fake_file import AnyFileWrapper
 from pyfakefs.fake_open import fake_open
-from pyfakefs.helpers import IS_PYPY
+from pyfakefs.helpers import IS_PYPY, is_called_from_skipped_module
 
 if TYPE_CHECKING:
     from pyfakefs.fake_filesystem import FakeFilesystem
@@ -180,6 +180,14 @@ def lockf(
         ) -> Any:
             pass
 
-        def __getattr__(self, name):
+        def __getattribute__(self, name):
             """Forwards any unfaked calls to the standard fcntl module."""
-            return getattr(self._fcntl_module, name)
+            filesystem = object.__getattribute__(self, "filesystem")
+            fnctl_module = object.__getattribute__(self, "_fcntl_module")
+            if filesystem.patcher:
+                skip_names = filesystem.patcher._skip_names
+                if is_called_from_skipped_module(skip_names=skip_names):
+                    # remove the `self` argument for FakeOsModule methods
+                    return getattr(fnctl_module, name)
+
+            return object.__getattribute__(self, name)

pyfakefs/fake_open.py

@@ -44,6 +44,7 @@
 )
 from pyfakefs.helpers import (
     AnyString,
+    is_called_from_skipped_module,
     is_root,
     PERM_READ,
     PERM_WRITE,
@@ -83,23 +84,7 @@ def fake_open(
     """Redirect the call to FakeFileOpen.
     See FakeFileOpen.call() for description.
     """
-    # workaround for built-in open called from skipped modules (see #552)
-    # as open is not imported explicitly, we cannot patch it for
-    # specific modules; instead we check if the caller is a skipped
-    # module (should work in most cases)
-    stack = traceback.extract_stack(limit=3)
-    # handle the case that we try to call the original `open_code`
-    # and get here instead (since Python 3.12)
-    from_open_code = (
-        sys.version_info >= (3, 12)
-        and stack[0].name == "open_code"
-        and stack[0].line == "return self._io_module.open_code(path)"
-    )
-    module_name = os.path.splitext(stack[0].filename)[0]
-    module_name = module_name.replace(os.sep, ".")
-    if from_open_code or any(
-        [module_name == sn or module_name.endswith("." + sn) for sn in skip_names]
-    ):
+    if is_called_from_skipped_module(skip_names=skip_names):
         return io.open(  # pytype: disable=wrong-arg-count
             file,
             mode,

pyfakefs/helpers.py

@@ -449,7 +449,7 @@ def is_called_from_skipped_module(skip_names: list) -> bool:
         (
             frame.filename
             for frame in stack[::-1]
-            if not frame.filename.startswith("<frozen importlib")
+            if not frame.filename.startswith("<frozen ")
             and not frame.filename.startswith(STDLIB_PATH)
             and (
                 not frame.filename.startswith(PYFAKEFS_PATH)