May 6, 2024 · Oct 20, 2023 · Oct 20, 2023 · Oct 20, 2023 · May 4, 2024 · May 5, 2024
diff --git a/Lib/pdb.py b/Lib/pdb.py
        # Otherwise, we can just raise an exception and normal exec will be used.

        code = compile(source, "<string>", "exec")
        if any(isinstance(const, CodeType) for const in code.co_consts):
        ifnotany(isinstance(const, CodeType) for const in code.co_consts):
            return False

        # locals could be a proxy which does not support pop
                  "finally:\n" +
                  "  __pdb_eval__['write_back'] = locals()")

        local_vars = list(locals_copy.keys())

        # Build a closure source code with freevars from locals like:
        # def outer():
        #   var = None
        #     <source>
        #   return __pdb_scope.__code__
        source_with_closure = ("def __pdb_outer():\n" +
                               "\n".join(f"  {var} = None" for var inlocal_vars) + "\n" +
                               "\n".join(f"  {var} = None" for var inlocals_copy) + "\n" +
                               "  def __pdb_scope():\n" +
                               "\n".join(f"    nonlocal {var}" for var inlocal_vars) + "\n" +
                               "\n".join(f"    nonlocal {var}" for var inlocals_copy) + "\n" +
                               textwrap.indent(source, "    ") + "\n" +
                               "  return __pdb_scope.__code__"
                               )

        # Get the code object of __pdb_scope()
        # The exec fills locals_copy with the __pdb_outer() function and we can call
        # that to get the code object of __pdb_scope()
        exec(source_with_closure, {}, locals_copy)
        try:
            exec(source_with_closure, {}, locals_copy)
        except Exception:
            return False
        code = locals_copy.pop("__pdb_outer")()

        cells = tuple(types.CellType(locals_copy.get(var)) for var in code.co_freevars)
            return False

        # get the data we need from the statement
        pdb_eval = locals_copy["__pdb_eval__]
        pdb_eval = locals_copy["__pdb_eval__"]

        # __pdb_eval__ should not be updated back to locals
        pdb_eval["write_back"].pop("__pdb_eval__")
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
    ...     'g',
    ...     'y = y',
    ...     'global g; g',
    ...     'global g; (lambda: g)()',
    ...     '(lambda: x)()',
    ...     '(lambda: g)()',
    ...     'lst = [n for n in range(10) if (n % x) == 0]',
    *** NameError: name 'y' is not defined
    (Pdb) global g; g
    1
    (Pdb) global g; (lambda: g)()
    1
    (Pdb) (lambda: x)()
    2
    (Pdb) (lambda: g)()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -638,7 +638,7 @@ def _exec_in_closure(self, source, globals, locals):
		# Otherwise, we can just raise an exception and normal exec will be used.

		code = compile(source, "<string>", "exec")
		if any(isinstance(const, CodeType) for const in code.co_consts):
		ifnotany(isinstance(const, CodeType) for const in code.co_consts):
		return False

		# locals could be a proxy which does not support pop
Expand All		@@ -664,8 +664,6 @@ def _exec_in_closure(self, source, globals, locals):
		"finally:\n" +
		" __pdb_eval__['write_back'] = locals()")

		local_vars = list(locals_copy.keys())

		# Build a closure source code with freevars from locals like:
		# def outer():
gaogaotiantian marked this conversation as resolved. OutdatedShow resolvedHide resolved
		# var = None
Expand All		@@ -674,17 +672,20 @@ def _exec_in_closure(self, source, globals, locals):
		# <source>
		# return __pdb_scope.__code__
		source_with_closure = ("def __pdb_outer():\n" +
		"\n".join(f" {var} = None" for var inlocal_vars) + "\n" +
		"\n".join(f" {var} = None" for var inlocals_copy) + "\n" +
		" def __pdb_scope():\n" +
		"\n".join(f" nonlocal {var}" for var inlocal_vars) + "\n" +
		"\n".join(f" nonlocal {var}" for var inlocals_copy) + "\n" +
		textwrap.indent(source, " ") + "\n" +
		" return __pdb_scope.__code__"
		)

		# Get the code object of __pdb_scope()
		# The exec fills locals_copy with the __pdb_outer() function and we can call
		# that to get the code object of __pdb_scope()
		exec(source_with_closure, {}, locals_copy)
		try:
		exec(source_with_closure, {}, locals_copy)
		except Exception:
		return False
		code = locals_copy.pop("__pdb_outer")()

		cells = tuple(types.CellType(locals_copy.get(var)) for var in code.co_freevars)
Expand All		@@ -695,7 +696,7 @@ def _exec_in_closure(self, source, globals, locals):
		return False

		# get the data we need from the statement
		pdb_eval = locals_copy["__pdb_eval__]
		pdb_eval = locals_copy["__pdb_eval__"]

		# __pdb_eval__ should not be updated back to locals
		pdb_eval["write_back"].pop("__pdb_eval__")
brandtbucher marked this conversation as resolved. Show resolvedHide resolved
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2239,6 +2239,7 @@ def test_pdb_closure():
		... 'g',
		... 'y = y',
		... 'global g; g',
		... 'global g; (lambda: g)()',
		... '(lambda: x)()',
		... '(lambda: g)()',
		... 'lst = [n for n in range(10) if (n % x) == 0]',
Expand All		@@ -2263,6 +2264,8 @@ def test_pdb_closure():
		*** NameError: name 'y' is not defined
		(Pdb) global g; g
		1
		(Pdb) global g; (lambda: g)()
		1
		(Pdb) (lambda: x)()
		2
		(Pdb) (lambda: g)()
Expand Down