[Python-checkins] CVS: python/dist/src/Lib bdb.py,1.29,1.30

[Eric S. Raymond]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv3524

Modified Files:
	bdb.py 
Log Message:
String method conversion.


Index: bdb.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/bdb.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** bdb.py	2001/01/20 19:54:20	1.29
--- bdb.py	2001/02/09 04:59:26	1.30
***************
*** 307,311 ****
  
      def format_stack_entry(self, frame_lineno, lprefix=': '):
!         import linecache, repr, string
          frame, lineno = frame_lineno
          filename = self.canonic(frame.f_code.co_filename)
--- 307,311 ----
  
      def format_stack_entry(self, frame_lineno, lprefix=': '):
!         import linecache, repr
          frame, lineno = frame_lineno
          filename = self.canonic(frame.f_code.co_filename)
***************
*** 328,332 ****
              s = s + repr.repr(rv)
          line = linecache.getline(filename, lineno)
!         if line: s = s + lprefix + string.strip(line)
          return s
  
--- 328,332 ----
              s = s + repr.repr(rv)
          line = linecache.getline(filename, lineno)
!         if line: s = s + lprefix + line.strip()
          return s
  
***************
*** 535,544 ****
          print '+++ call', name, args
      def user_line(self, frame):
!         import linecache, string
          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)
!         print '+++', fn, frame.f_lineno, name, ':', string.strip(line)
      def user_return(self, frame, retval):
          print '+++ return', retval
--- 535,544 ----
          print '+++ call', name, args
      def user_line(self, frame):
!         import linecache
          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)
!         print '+++', fn, frame.f_lineno, name, ':', line.strip()
      def user_return(self, frame, retval):
          print '+++ return', retval
***************
*** 559,560 ****
--- 559,562 ----
      t = Tdb()
      t.run('import bdb; bdb.foo(10)')
+ 
+ # end