commit 30327242b3c83cfbedb21b5b869c52b855573221
author Nick Coghlan <ncoghlan@gmail.com> Sun Dec 14 11:30:16 2008 +0000
committer Nick Coghlan <ncoghlan@gmail.com> Sun Dec 14 11:30:16 2008 +0000
tree 98bcb76f83d984d0fb45fcabd3dbee4d6f06ba82
parent d0a70d4bab2ba95ce1d6eae73f61f1e4cdf35941

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
........

Lib/bdb.py

diff --git a/Lib/bdb.py b/Lib/bdb.py
index 5288cc0..f29fa46 100644
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -347,7 +347,7 @@
             rv = frame.f_locals['__return__']
             s = s + '->'
             s = s + repr.repr(rv)
-        line = linecache.getline(filename, lineno)
+        line = linecache.getline(filename, lineno, frame.f_globals)
         if line: s = s + lprefix + line.strip()
         return s
 
@@ -589,7 +589,7 @@
         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