GeezerVison

Original file line number	Diff line number	Diff line change
Expand Up		@@ -84,6 +84,8 @@
		import traceback
		import linecache

		from typing import Union


		class Restart(Exception):
		"""Causes a debugger to be restarted for the debugged python program."""
Expand Down Expand Up		@@ -147,6 +149,23 @@ def check(self):
		# Replace pdb's dir with script's dir in front of module search path.
		sys.path[0] = os.path.dirname(self)

		@property
		def filename(self):
		return self

		@property
		def namespace(self):
		return dict(
		__name__='__main__',
		__file__=self,
		__builtins__=__builtins__,
		)

		@property
		def code(self):
		with io.open(self) as fp:
		return f"exec(compile({fp.read()!r}, {self!r}, 'exec'))"


		class ModuleTarget(str):
		def check(self):
Expand All		@@ -157,6 +176,31 @@ def details(self):
		import runpy
		return runpy._get_module_details(self)

		@property
		def filename(self):
		return self.code.co_filename

		@property
		def code(self):
		name, spec, code = self.details
		return code

		@property
		def spec(self):
		name, spec, code = self.details
		return spec

		@property
		def namespace(self):
		return dict(
		__name__='__main__',
		__file__=os.path.normcase(os.path.abspath(self.filename)),
		__package__=self.spec.parent,
		__loader__=self.spec.loader,
		__spec__=self.spec,
		__builtins__=__builtins__,
		)


		# Interaction prompt line will separate file and call info from code
		# text using value of line_prefix string. A newline and arrow may
Expand Down Expand Up		@@ -1564,50 +1608,26 @@ def lookupmodule(self, filename):
		return fullname
		return None

		@functools.singledispatchmethod
		def _run(self, target: 'ModuleTarget'):
		def _run(self, target: Union[ModuleTarget, ScriptTarget]):
		# When bdb sets tracing, a number of call and line events happen
		# BEFORE debugger even reaches user's code (and the exact sequence of
		# events depends on python version). Take special measures to
		# avoid stopping before reaching the main script (see user_line and
		# user_call for details).
		self._wait_for_mainpyfile = True
		self._user_requested_quit = False
		mod_name, mod_spec, code = target.details
		self.mainpyfile = self.canonic(code.co_filename)
		import __main__
		__main__.__dict__.clear()
		__main__.__dict__.update({
		"__name__": "__main__",
		"__file__": self.mainpyfile,
		"__package__": mod_spec.parent,
		"__loader__": mod_spec.loader,
		"__spec__": mod_spec,
		"__builtins__": __builtins__,
		})
		self.run(code)

		@_run.register
		def _(self, filename: 'ScriptTarget'):
		# The script has to run in __main__ namespace (or imports from
		# __main__ will break).
		#
		# So we clear up the __main__ and set several special variables
		# (this gets rid of pdb's globals and cleans old variables on restarts).

		self.mainpyfile = self.canonic(target.filename)

		# The target has to run in __main__ namespace (or imports from
		# __main__ will break). Clear __main__ and replace with
		# the target namespace.
		import __main__
		__main__.__dict__.clear()
		__main__.__dict__.update({"__name__" : "__main__",
		"__file__" : filename,
		"__builtins__": __builtins__,
		})
		__main__.__dict__.update(target.namespace)

		self.run(target.code)

		# When bdb sets tracing, a number of call and line events happens
		# BEFORE debugger even reaches user's code (and the exact sequence of
		# events depends on python version). So we take special measures to
		# avoid stopping before we reach the main script (see user_line and
		# user_call for details).
		self._wait_for_mainpyfile = True
		self.mainpyfile = self.canonic(filename)
		self._user_requested_quit = False
		with io.open_code(filename) as fp:
		statement = "exec(compile(%r, %r, 'exec'))" % \
		(fp.read(), self.mainpyfile)
		self.run(statement)

		# Collect all command help into docstring, if not run with -OO

Expand Down

2 changes: 1 addition & 1 deletion 2 Lib/test/test_pdb.py

Show comments

View file

Open in desktop

Original file line number	Diff line number	Diff line change
Expand Up		@@ -362,7 +362,7 @@ def test_pdb_breakpoints_preserved_across_interactive_sessions():
		1 breakpoint keep yes at ...test_pdb.py:...
		2 breakpoint keep yes at ...test_pdb.py:...
		(Pdb) break pdb.find_function
		Breakpoint 3 at ...pdb.py:95
		Breakpoint 3 at ...pdb.py:97
		(Pdb) break
		Num Type Disp Enb Where
		1 breakpoint keep yes at ...test_pdb.py:...
Expand Down

Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.