Change to custom __delattr__ implementation

Author: p-sawicki

mypyc/test-data/run-classes.test

@@ -5188,58 +5188,51 @@ test_no_setattr_nonnative()
 from testutil import assertRaises
 
 class DelAttr:
-    __deletable__ = ["regular_attr"]
+    __deletable__ = ["del_counter"]
 
     _attributes: dict[str, object]
-    regular_attr: int
+    del_counter: int = 0
 
-    def __init__(self, regular_attr: int) -> None:
-        object.__setattr__(self, "regular_attr", regular_attr)
+    def __init__(self) -> None:
         object.__setattr__(self, "_attributes", {})
 
     def __setattr__(self, key: str, val: object) -> None:
-        if key == "regular_attr":
-            object.__setattr__(self, key, val)
+        if key == "del_counter":
+            object.__setattr__(self, "del_counter", val)
         else:
             self._attributes[key] = val
 
     def __delattr__(self, key: str) -> None:
-        if key == "regular_attr":
-            object.__delattr__(self, "regular_attr")
+        if key == "del_counter":
+            self.del_counter += 1
         else:
             del self._attributes[key]
 
 def test_deletable_attr() -> None:
-    i = DelAttr(101)
-    assert i.regular_attr == 101
-
-    del i.regular_attr
-    with assertRaises(AttributeError):
-        i.regular_attr
-
-    i.regular_attr = 102
-    assert i.regular_attr == 102
+    i = DelAttr()
+    assert i.del_counter == 0
+    del i.del_counter
+    assert i.del_counter == 1
 
 [case testDelAttrWithDeletableAttrInterpreted]
 class DelAttr:
-    __deletable__ = ["regular_attr"]
+    __deletable__ = ["del_counter"]
 
     _attributes: dict[str, object]
-    regular_attr: int
+    del_counter: int = 0
 
-    def __init__(self, regular_attr: int) -> None:
-        object.__setattr__(self, "regular_attr", regular_attr)
+    def __init__(self) -> None:
         object.__setattr__(self, "_attributes", {})
 
     def __setattr__(self, key: str, val: object) -> None:
-        if key == "regular_attr":
-            object.__setattr__(self, key, val)
+        if key == "del_counter":
+            object.__setattr__(self, "del_counter", val)
         else:
             self._attributes[key] = val
 
     def __delattr__(self, key: str) -> None:
-        if key == "regular_attr":
-            object.__delattr__(self, "regular_attr")
+        if key == "del_counter":
+            self.del_counter += 1
         else:
             del self._attributes[key]
 
@@ -5248,14 +5241,9 @@ from native import DelAttr
 from testutil import assertRaises
 
 def test_deletable_attr() -> None:
-    i = DelAttr(101)
-    assert i.regular_attr == 101
-
-    del i.regular_attr
-    with assertRaises(AttributeError):
-        i.regular_attr
-
-    i.regular_attr = 102
-    assert i.regular_attr == 102
+    i = DelAttr()
+    assert i.del_counter == 0
+    del i.del_counter
+    assert i.del_counter == 1
 
 test_deletable_attr()