clean-code

Author: Darshan808

IPython/core/guarded_eval.py

@@ -496,7 +496,7 @@ def guarded_eval(code: str, context: EvaluationContext):
     ast.Not: ("__not__",),
 }
 
-
+GENERIC_CONTAINER_TYPES = (dict, list, set, tuple, frozenset)
 class ImpersonatingDuck:
     """A dummy class used to create objects of other classes without calling their ``__init__``"""
 
@@ -658,6 +658,35 @@ def _handle_assign(node: ast.Assign, context: EvaluationContext):
     return None
 
 
+def _handle_annassign(node, context):
+    annotation_value = _resolve_annotation(eval_node(node.annotation, context), context)
+    value = node.value
+
+    # Use Value for generic types
+    use_value = isinstance(annotation_value, GENERIC_CONTAINER_TYPES)
+
+    # LOCAL VARIABLE
+    if getattr(node, "simple", False) and isinstance(node.target, ast.Name):
+        name = node.target.id
+        if use_value:
+            return _handle_assign(
+                ast.Assign(targets=[node.target], value=value), context
+            )
+        context.transient_locals[name] = annotation_value
+        return None
+
+    # INSTANCE ATTRIBUTE
+    if _is_instance_attribute_assignment(node.target, context):
+        attr = node.target.attr
+        if use_value:
+            return _handle_assign(
+                ast.Assign(targets=[node.target], value=value), context
+            )
+        context.class_transients[attr] = annotation_value
+        return None
+
+    return None
+
 def _extract_args_and_kwargs(node: ast.Call, context: EvaluationContext):
     args = [eval_node(arg, context) for arg in node.args]
     kwargs = {
@@ -900,42 +929,7 @@ def dummy_function(*args, **kwargs):
     if isinstance(node, ast.Assign):
         return _handle_assign(node, context)
     if isinstance(node, ast.AnnAssign):
-        if node.simple:
-            annotation_value = _resolve_annotation(
-                eval_node(node.annotation, context), context
-            )
-            # If there's an actual value and annotation is generic, use value itself
-            if node.value is not None and type(annotation_value) in (
-                dict,
-                list,
-                set,
-                tuple,
-                frozenset,
-            ):
-                assign_node = ast.Assign(targets=[node.target], value=node.value)
-                _handle_assign(assign_node, context)
-            else:
-                context.transient_locals[node.target.id] = annotation_value
-
-        # Handle non-simple annotated assignments only for self.x: type = value
-        if _is_instance_attribute_assignment(node.target, context):
-            annotation_value = _resolve_annotation(
-                eval_node(node.annotation, context), context
-            )
-
-            if node.value is not None and annotation_value in (
-                dict,
-                list,
-                set,
-                tuple,
-                frozenset,
-            ):
-                assign_node = ast.Assign(targets=[node.target], value=node.value)
-                _handle_assign(assign_node, context)
-            else:
-                context.class_transients[node.target.attr] = annotation_value
-
-        return None
+        return _handle_annassign(node, context)
     if isinstance(node, ast.Expression):
         return eval_node(node.body, context)
     if isinstance(node, ast.Expr):