Remove property from python_type function (#152900)

guilhermeleobas · pytorchmergebot · commit a4459cd4e3af · 2025-05-13T16:26:25.000Z
Pull Request resolved: #152900 Approved by: https://github.com/amjames, https://github.com/anijain2305 ghstack dependencies: #153070
diff --git a/test/dynamo/test_exceptions.py b/test/dynamo/test_exceptions.py
@@ -22,6 +22,15 @@ class CustomException(Exception):
     ...
 
 
+class CustomExceptionMeta(type):
+    def __instancecheck__(cls, instance):
+        return True
+
+
+class CustomExceptionWithInstanceCheck(Exception, metaclass=CustomExceptionMeta):
+    ...
+
+
 class CustomExceptionWithArgs(Exception):
     def __init__(self, a, b=None):
         self.a = a
@@ -149,6 +158,14 @@ def f(x: torch.Tensor):
         out = f(inp)
         self.assertTrue(torch.equal(out, inp + 1))
 
+    @make_dynamo_test
+    def test_isinstance_CustomException(self):
+        assert isinstance(CustomException, type)
+        assert not isinstance(CustomException(), type)
+        C = CustomExceptionWithInstanceCheck
+        assert isinstance(C, C)
+        assert isinstance(C(), C)
+
     @make_dynamo_test
     def test_propagate_exception_inside_ctx_manager(self):
         @contextlib.contextmanager
diff --git a/torch/_dynamo/variables/builtin.py b/torch/_dynamo/variables/builtin.py
@@ -1805,6 +1805,9 @@ def check_type(ty):
                 isinstance_type.__class__.__instancecheck__(isinstance_type, arg.value)
             )
 
+        if isinstance(arg, variables.UserDefinedExceptionClassVariable):
+            return ConstantVariable.create(isinstance(arg_type, isinstance_type))
+
         isinstance_type_tuple: tuple[type, ...]
         if isinstance(isinstance_type, type) or callable(
             # E.g. isinstance(obj, typing.Sequence)
diff --git a/torch/_dynamo/variables/user_defined.py b/torch/_dynamo/variables/user_defined.py
@@ -707,7 +707,6 @@ class UserDefinedExceptionClassVariable(UserDefinedClassVariable):
     def fn(self):
         return self.value
 
-    @property
     def python_type(self):
         return self.value
 

Original file line number	Diff line number	Diff line change
`@@ -1805,6 +1805,9 @@ def check_type(ty):`
`1805`	`1805`	`isinstance_type.__class__.__instancecheck__(isinstance_type, arg.value)`
`1806`	`1806`	`)`
`1807`	`1807`
	`1808`	`+ if isinstance(arg, variables.UserDefinedExceptionClassVariable):`
	`1809`	`+ return ConstantVariable.create(isinstance(arg_type, isinstance_type))`
	`1810`	`+`
`1808`	`1811`	`isinstance_type_tuple: tuple[type, ...]`
`1809`	`1812`	`if isinstance(isinstance_type, type) or callable(`
`1810`	`1813`	`# E.g. isinstance(obj, typing.Sequence)`