Merge remote-tracking branch 'upstream/main' into add-3.13

Author: hugovk

deadcode/visitor/utils.py

@@ -57,7 +57,7 @@ def get_decorator_name(decorator: ast.Call | ast.Attribute) -> str:
     while isinstance(decorator, ast.Attribute):
         parts.append(decorator.attr)
         decorator = decorator.value  # type: ignore
-    parts.append(decorator.id)  # type: ignore
+        parts.append(str(id(decorator)))  # type: ignore
     return '@' + '.'.join(reversed(parts))
 
 

tests/visitor/test_utils.py

@@ -0,0 +1,31 @@
+import ast
+import re
+
+from deadcode.visitor.utils import get_decorator_name
+
+class TestUtils:
+    def test_get_decorator_name_attribute(self):
+        # Test with a decorator with an attribute
+        decorator = ast.Attribute(value=ast.Name(id='module', ctx=ast.Load()), attr='my_decorator1')
+        assert get_decorator_name(decorator).endswith('.my_decorator1')
+
+        # Test with a complex decorator
+        decorator = ast.Attribute(
+            value=decorator,  # Create nested attributes
+            attr='my_decorator2',
+            ctx=ast.Load()
+        )
+        assert re.match(r'@\d+\.my_decorator1\.\d+\.my_decorator2', get_decorator_name(decorator))
+
+
+    def test_get_decorator_name_call(self):
+        decorator = ast.Attribute(value=ast.Name(id='module', ctx=ast.Load()), attr='my_decorator')
+        assert re.match(r'@\d+\.my_decorator', get_decorator_name(decorator))
+
+        # Test with a decorator that is a call
+        decorator = ast.Call(
+            func=decorator,
+            args=[],
+            keywords=[]
+        )
+        assert re.match(r'@\d+\.my_decorator', get_decorator_name(decorator))