diff --git a/src/fake_bpy_module/common.py b/src/fake_bpy_module/common.py index ccb3b1087..23ec33174 100644 --- a/src/fake_bpy_module/common.py +++ b/src/fake_bpy_module/common.py @@ -1364,12 +1364,12 @@ def _get_refined_data_type_fast( if re.match(r"^Depends on function prototype", dtype_str): return ModifierDataType("typing.Any") - # [Pattern] `bpy.types.AnyType` + # [Pattern] `AnyType` # [Test] # File: refiner_test.py # Function: test_get_refined_data_type_for_various_patterns - # Pattern: `bpy.types.AnyType` - if re.match(r"`bpy.types.AnyType`", dtype_str): + # Pattern: `AnyType` + if dtype_str == "`AnyType`": return ModifierDataType("typing.Any") if re.match(r"^(any|Any type.)$", dtype_str): @@ -1524,11 +1524,7 @@ def _get_refined_data_type_fast( m = re.match(r"(int|float)$", dtype_str) if m: return BuiltinDataType(m.group(1)) - m = re.match(r"^unsigned int$", dtype_str) - if m: - return BuiltinDataType("int") - m = re.match(r"^int \(boolean\)$", dtype_str) - if m: + if dtype_str in ("unsigned int", "int (boolean)"): return BuiltinDataType("int") m = re.match(r"^int sequence$", dtype_str) if m: diff --git a/tests/python/fake_bpy_module_test/fake_bpy_module_test/refiner_test.py b/tests/python/fake_bpy_module_test/fake_bpy_module_test/refiner_test.py index d4c736eb3..3dd067e03 100644 --- a/tests/python/fake_bpy_module_test/fake_bpy_module_test/refiner_test.py +++ b/tests/python/fake_bpy_module_test/fake_bpy_module_test/refiner_test.py @@ -633,10 +633,9 @@ def test_get_refined_data_type_for_various_patterns(self): self.assertEqual(dt.modifier_data_type(), "typing.Callable") self.assertEqual(dt.to_string(), "typing.Callable") - # Pattern: `bpy.types.AnyType` + # Pattern: `AnyType` # Ref: https://github.com/nutti/fake-bpy-module/issues/141 - intermidiate_data_type = IntermidiateDataType( - "`bpy.types.AnyType`") + intermidiate_data_type = IntermidiateDataType("`AnyType`") refined_data_type = refiner.get_refined_data_type( intermidiate_data_type, "module_1", 'FUNC_ARG') self.assertEqual(refined_data_type.type(), 'MODIFIER')