diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2008-12-14 11:50:48 +0000 |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2008-12-14 11:50:48 +0000 |
| commit | f088e5e6cc0e7ad7991a910be13510ca33e91958 (patch) | |
| tree | bc4281856af88400076b08b3e6d4431565017e3e /Lib/bdb.py | |
| parent | 80a0c7f62366235059bd2e5892554fa75c7670ca (diff) | |
| download | cpython-git-f088e5e6cc0e7ad7991a910be13510ca33e91958.tar.gz | |
Merged revisions 67750-67751 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67750 | nick.coghlan | 2008-12-14 20:54:50 +1000 (Sun, 14 Dec 2008) | 1 line
Fix several issues relating to access to source code inside zipfiles. Initial work by Alexander Belopolsky. See Misc/NEWS in this checkin for details.
........
r67751 | nick.coghlan | 2008-12-14 21:09:40 +1000 (Sun, 14 Dec 2008) | 1 line
Add file that was missed from r67750
........
Diffstat (limited to 'Lib/bdb.py')
| -rw-r--r-- | Lib/bdb.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/bdb.py b/Lib/bdb.py index 88088a5196..6dc54eda4b 100644 --- a/Lib/bdb.py +++ b/Lib/bdb.py @@ -346,7 +346,7 @@ class Bdb: rv = frame.f_locals['__return__'] s = s + '->' s = s + reprlib.repr(rv) - line = linecache.getline(filename, lineno) + line = linecache.getline(filename, lineno, frame.f_globals) if line: s = s + lprefix + line.strip() return s @@ -588,7 +588,7 @@ class Tdb(Bdb): name = frame.f_code.co_name if not name: name = '???' fn = self.canonic(frame.f_code.co_filename) - line = linecache.getline(fn, frame.f_lineno) + line = linecache.getline(fn, frame.f_lineno, frame.f_globals) print('+++', fn, frame.f_lineno, name, ':', line.strip()) def user_return(self, frame, retval): print('+++ return', retval) |