Fail closed on mutable module captures in class signatures
This commit is contained in:
@@ -855,6 +855,63 @@ NODE_CLASS_MAPPINGS = {
|
|||||||
self.assertEqual(["IMAGE"], result["nodes"]["DefinitionTimeReturnTypesNode"]["outputs"])
|
self.assertEqual(["IMAGE"], result["nodes"]["DefinitionTimeReturnTypesNode"]["outputs"])
|
||||||
self.assertEqual("ok", result["pack"]["status"])
|
self.assertEqual("ok", result["pack"]["status"])
|
||||||
|
|
||||||
|
def test_mutable_module_return_types_capture_skips_node(self):
|
||||||
|
source = '''
|
||||||
|
RETURNS = ["IMAGE"]
|
||||||
|
|
||||||
|
|
||||||
|
class MutableModuleReturnTypesNode:
|
||||||
|
RETURN_TYPES = RETURNS
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(cls):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"image": ("IMAGE",),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
RETURNS.clear()
|
||||||
|
|
||||||
|
NODE_CLASS_MAPPINGS = {
|
||||||
|
"MutableModuleReturnTypesNode": MutableModuleReturnTypesNode,
|
||||||
|
}
|
||||||
|
'''
|
||||||
|
result = self._extract_source(source, "mutable-module-return-types-pack")
|
||||||
|
|
||||||
|
self.assertEqual({}, result["nodes"])
|
||||||
|
self.assertEqual("no_static_nodes", result["pack"]["status"])
|
||||||
|
|
||||||
|
def test_mutable_module_return_names_capture_skips_node(self):
|
||||||
|
source = '''
|
||||||
|
NAMES = ["image"]
|
||||||
|
|
||||||
|
|
||||||
|
class MutableModuleReturnNamesNode:
|
||||||
|
RETURN_TYPES = ("IMAGE",)
|
||||||
|
RETURN_NAMES = NAMES
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def INPUT_TYPES(cls):
|
||||||
|
return {
|
||||||
|
"required": {
|
||||||
|
"image": ("IMAGE",),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
NAMES.clear()
|
||||||
|
|
||||||
|
NODE_CLASS_MAPPINGS = {
|
||||||
|
"MutableModuleReturnNamesNode": MutableModuleReturnNamesNode,
|
||||||
|
}
|
||||||
|
'''
|
||||||
|
result = self._extract_source(source, "mutable-module-return-names-pack")
|
||||||
|
|
||||||
|
self.assertEqual({}, result["nodes"])
|
||||||
|
self.assertEqual("no_static_nodes", result["pack"]["status"])
|
||||||
|
|
||||||
def test_subscript_assignment_to_return_types_skips_node(self):
|
def test_subscript_assignment_to_return_types_skips_node(self):
|
||||||
source = '''
|
source = '''
|
||||||
class SubscriptMutatedReturnTypesNode:
|
class SubscriptMutatedReturnTypesNode:
|
||||||
|
|||||||
@@ -398,6 +398,10 @@ def _class_defs(tree):
|
|||||||
return {node.name: node for node in tree.body if isinstance(node, ast.ClassDef)}
|
return {node.name: node for node in tree.body if isinstance(node, ast.ClassDef)}
|
||||||
|
|
||||||
|
|
||||||
|
def _is_mutable_env_reference(node, env):
|
||||||
|
return isinstance(node, ast.Name) and node.id in env and _is_mutable_static_value(env[node.id])
|
||||||
|
|
||||||
|
|
||||||
def _class_attr(cls, name, env):
|
def _class_attr(cls, name, env):
|
||||||
value = _MISSING
|
value = _MISSING
|
||||||
aliases = set()
|
aliases = set()
|
||||||
@@ -419,6 +423,9 @@ def _class_attr(cls, name, env):
|
|||||||
if name not in target_names:
|
if name not in target_names:
|
||||||
continue
|
continue
|
||||||
if len(stmt.targets) == 1 and isinstance(stmt.targets[0], ast.Name):
|
if len(stmt.targets) == 1 and isinstance(stmt.targets[0], ast.Name):
|
||||||
|
if _is_mutable_env_reference(stmt.value, env):
|
||||||
|
value = _INVALID
|
||||||
|
else:
|
||||||
try:
|
try:
|
||||||
value = _literal(stmt.value, env)
|
value = _literal(stmt.value, env)
|
||||||
except UnsupportedStaticExpression:
|
except UnsupportedStaticExpression:
|
||||||
@@ -445,6 +452,9 @@ def _class_attr(cls, name, env):
|
|||||||
continue
|
continue
|
||||||
if not isinstance(stmt.target, ast.Name):
|
if not isinstance(stmt.target, ast.Name):
|
||||||
value = _INVALID
|
value = _INVALID
|
||||||
|
else:
|
||||||
|
if _is_mutable_env_reference(stmt.value, env):
|
||||||
|
value = _INVALID
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
value = _literal(stmt.value, env)
|
value = _literal(stmt.value, env)
|
||||||
|
|||||||
Reference in New Issue
Block a user