Conditional skip for MicroPython.

ntoll · ntoll · commit df2bfafb6a5d · 2024-08-07T18:12:53.000+01:00
diff --git a/index.html b/index.html
@@ -9,10 +9,10 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <!-- PyScript CSS -->
-    <link rel="stylesheet" href="https://pyscript.net/releases/2024.6.1/core.css">
+    <link rel="stylesheet" href="https://pyscript.net/releases/2024.8.2/core.css">
 
     <!-- This script tag bootstraps PyScript -->
-    <script type="module" src="https://pyscript.net/releases/2024.6.1/core.js"></script>
+    <script type="module" src="https://pyscript.net/releases/2024.8.2/core.js"></script>
 </head>
 <body>
     <h1>MicroMock test suite (MicroPython)</h1>
diff --git a/index2.html b/index2.html
@@ -9,10 +9,10 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <!-- PyScript CSS -->
-    <link rel="stylesheet" href="https://pyscript.net/releases/2024.6.1/core.css">
+    <link rel="stylesheet" href="https://pyscript.net/releases/2024.8.2/core.css">
 
     <!-- This script tag bootstraps PyScript -->
-    <script type="module" src="https://pyscript.net/releases/2024.6.1/core.js"></script>
+    <script type="module" src="https://pyscript.net/releases/2024.8.2/core.js"></script>
 </head>
 <body>
     <h1>MicroMock test suite (Pyodide)</h1>
diff --git a/tests/test_patch_target.py b/tests/test_patch_target.py
@@ -89,7 +89,10 @@ def test_patch_target_function():
     patch_target(target, old_function)
 
 
-@upytest.skip("This doesn't seem to work. Check with Damien.")
+@upytest.skip(
+    "This doesn't work because of a MicroPython bug. Damien to fix.",
+    when=upytest.is_micropython,
+)
 def test_patch_target_class_method():
     """
     The target path is a dotted string with a colon, pointing to a method in a
diff --git a/umock.py b/umock.py
@@ -314,12 +314,16 @@ def __getattr__(self, name):
         name.
         """
         if name.startswith("_") or name in _RESERVED_MOCK_ATTRIBUTES:
+            # Special attributes are handled as normal attributes.
             return self.__dict__.get(name)
         elif name in self.__dict__:
+            # Existing attributes are returned as is.
             return self.__dict__[name]
         elif "_spec" in self.__dict__ and name not in self._spec:
+            # If the attribute is not in the spec then raise an AttributeError.
             raise AttributeError(f"Mock object has no attribute '{name}'.")
         else:
+            # Otherwise, create a new mock object for the attribute.
             new_mock = Mock()
             setattr(self, name, new_mock)
             return new_mock
@@ -574,14 +578,18 @@ def __getattr__(self, name):
         name.
         """
         if name.startswith("_") or name in _RESERVED_MOCK_ATTRIBUTES:
+            # Special attributes are handled as normal attributes.
             return self.__dict__.get(name)
         elif name in self.__dict__:
+            # Existing attributes are returned as is.
             return self.__dict__[name]
         elif "_spec" in self.__dict__ and name not in self._spec:
+            # If the attribute is not in the spec then raise an AttributeError.
             raise AttributeError(
                 f"AsyncMock object has no attribute '{name}'."
             )
         else:
+            # Otherwise, create a new mock object for the attribute.
             new_mock = AsyncMock()
             setattr(self, name, new_mock)
             return new_mock
@@ -625,7 +633,10 @@ def wrapper(*args, **kwargs):
 
     def __enter__(self):
         """
-        Replace the target attribute with new.
+        Replace the target attribute with self.new.
+
+        If self.new is None, a new Mock object is created with the supplied
+        kwargs and bound to self.new before the target is replaced.
         """
         self.new = self.new or Mock(**self.kwargs)
         self._old = patch_target(self.target, self.new)
@@ -669,9 +680,9 @@ def patch_target(target, replacement):
     parts = attributes.split(".")
     for part in parts[:-1]:
         parent = getattr(parent, part)
-    # Get the original object that we're going to replace (so we can return
-    # it).
+    # Get the original target object that we're going to replace (so we can
+    # return it).
     old_object = getattr(parent, target_name)
-    # Replace the target attribute with the replacement.
+    # Replace the target with the replacement.
     setattr(parent, target_name, replacement)
     return old_object
