Fix breaking out from outer loop when handling property

python · Bobronium · Sep 27, 2024 · Sep 27, 2024 · Sep 27, 2024 · Sep 27, 2024
commit e91c28bcafcd2efc26be3c1822b40920b71cc6c7
@@ -1358,6 +1358,9 @@ def _add_slots(cls, is_frozen, weakref_slot, defined_fields):
                f = inspect.unwrap(f)
                if _update_func_cell_for__class__(f, cls, newcls):
                    break
+            else:
+                continue
+            break
        elif hasattr(member, "__get__") and not inspect.ismemberdescriptor(
            member
        ):

@@ -5141,6 +5141,52 @@ def foo(self, value):

        self.assertEqual(A().foo, "bar")

+    def test_pure_functions_preferred_to_custom_descriptors(self):
+        class CustomDescriptor:
+            def __init__(self, f):
+                self._wrapper = partial(f, value="bar")
+
+            def __get__(self, instance, owner):
+                return self._wrapper(instance)
+
+            def __dir__(self):
+                raise RuntimeError("Never should be accessed")
+
+        class B:
+            def foo(self, value):
+                return value
+
+        with self.assertRaises(RuntimeError) as context:
+            @dataclass(slots=True)
+            class A(B):
+                @CustomDescriptor
+                def foo(self, value): ...
+
+        self.assertEqual(context.exception.args, ("Never should be accessed",))
+
+        @dataclass(slots=True)
+        class A(B):
+            @CustomDescriptor
+            def foo(self, value):
+                return super().foo(value)
+
+            @property
+            def bar(self):
+                return super()
+
+        self.assertEqual(A().foo, "bar")
+
+        @dataclass(slots=True)
+        class A(B):
+            @CustomDescriptor
+            def foo(self, value):
+                return super().foo(value)
+
+            def bar(self):
+                return super()
+
+        self.assertEqual(A().foo, "bar")
+
    def test_custom_too_nested_descriptor(self):
        class UnnecessaryNestedWrapper:
            def __init__(self, wrapper):
-Original file line number
+Diff line change
@@ -1358,6 +1358,9 @@ def _add_slots(cls, is_frozen, weakref_slot, defined_fields):
                     f = inspect.unwrap(f)
                     if _update_func_cell_for__class__(f, cls, newcls):
                         break
                   ericvsmith marked this conversation as resolved.
              

          
            Show resolved
            Hide resolved
        

                
  
            
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.
+                else:
+                    continue
+                break
             elif hasattr(member, "__get__") and not inspect.ismemberdescriptor(
                 member
             ):
-          Expand Down