Mercurial > cpython-lru_cache-weakref
diff Lib/pdb.py @ 50162:4264cf00a75c 2.6
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
........
| author | Nick Coghlan <ncoghlan@gmail.com> |
|---|---|
| date | Sun, 14 Dec 2008 11:30:16 +0000 |
| parents | c6c32842e71d |
| children | 4acbbb3e65e2 5102bbf4ab74 |
line wrap: on
line diff
--- a/Lib/pdb.py Fri Dec 12 21:25:13 2008 +0000 +++ b/Lib/pdb.py Sun Dec 14 11:30:16 2008 +0000 @@ -440,7 +440,7 @@ Return `lineno` if it is, 0 if not (e.g. a docstring, comment, blank line or EOF). Warning: testing is not comprehensive. """ - line = linecache.getline(filename, lineno) + line = linecache.getline(filename, lineno, self.curframe.f_globals) if not line: print >>self.stdout, 'End of file' return 0 @@ -768,7 +768,7 @@ breaklist = self.get_file_breaks(filename) try: for lineno in range(first, last+1): - line = linecache.getline(filename, lineno) + line = linecache.getline(filename, lineno, self.curframe.f_globals) if not line: print >>self.stdout, '[EOF]' break