check-policy-to-cal-__dir__

Darshan808 · Darshan808 · commit 494bdd2b7ce9 · 2025-10-24T16:06:06.000+05:45
diff --git a/IPython/core/guarded_eval.py b/IPython/core/guarded_eval.py
@@ -396,7 +396,7 @@ class EvaluationContext:
     policy_overrides: dict = field(default_factory=dict)
     #: Transient local namespace used to store mocks
     transient_locals: dict = field(default_factory=dict)
-    #: Tranisents of class level
+    #: Transients of class level
     class_transients: dict | None = None
     #: Instance variable name used in the method definition
     instance_arg_name: str | None = None
@@ -926,7 +926,7 @@ def dummy_function(*args, **kwargs):
     return None
 
 
-def _merge_values(values):
+def _merge_values(values, policy: EvaluationPolicy):
     """Recursively merge multiple values, combining attributes and dict items."""
     if len(values) == 1:
         return values[0]
@@ -942,7 +942,9 @@ def _merge_values(values):
             for k, val in v.items():
                 key_values.setdefault(k, []).append(val)
 
-        merged_items = {k: _merge_values(vals) for k, vals in key_values.items()}
+        merged_items = {
+            k: _merge_values(vals, policy) for k, vals in key_values.items()
+        }
 
     if len(types) == 1:
         t = next(iter(types))
@@ -953,7 +955,8 @@ def _merge_values(values):
 
     attributes = set()
     for v in values:
-        attributes.update(dir(v))
+        if policy.can_call(v.__dir__):
+            attributes.update(dir(v))
     return _Duck(attributes=dict.fromkeys(attributes), items=merged_items)
 
 
@@ -966,7 +969,8 @@ def _infer_return_value(node: ast.FunctionDef, context: EvaluationContext):
     if len(return_values) == 1:
         return return_values[0]
 
-    return _merge_values(return_values)
+    policy = get_policy(context)
+    return _merge_values(return_values, policy)
 
 
 def _collect_return_values(body, context):
@@ -1266,6 +1270,8 @@ def _list_methods(cls, source=None):
     *_list_methods(collections.Counter, dict_non_mutating_methods),
     collections.Counter.elements,
     collections.Counter.most_common,
+    object.__dir__,
+    type.__dir__,
 }
 
 BUILTIN_GETATTR: set[MayHaveGetattr] = {
diff --git a/tests/test_completer.py b/tests/test_completer.py
@@ -2268,7 +2268,7 @@ def _(expected):
             "\n".join(
                 [
                     "def foo():",
-                    "    if 1+1==2:",
+                    "    if some_condition:",
                     "        return {'top':{'mid':{'leaf': 2}}}",
                     "    return {'top': {'mid':[]}}",
                     "foo()['top']['mid']['leaf'].",

Original file line number	Diff line number	Diff line change
`@@ -2268,7 +2268,7 @@ def _(expected):`
`2268`	`2268`	`"\n".join(`
`2269`	`2269`	`[`
`2270`	`2270`	`"def foo():",`
`2271`		`- " if 1+1==2:",`
	`2271`	`+ " if some_condition:",`
`2272`	`2272`	`" return {'top':{'mid':{'leaf': 2}}}",`
`2273`	`2273`	`" return {'top': {'mid':[]}}",`
`2274`	`2274`	`"foo()['top']['mid']['leaf'].",`