[Python-checkins] CVS: python/dist/src/Lib traceback.py,1.19,1.20

Eric S. Raymond esr@users.sourceforge.net
Fri, 09 Feb 2001 01:37:34 -0800


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

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


Index: traceback.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/traceback.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** traceback.py	2001/01/15 03:26:36	1.19
--- traceback.py	2001/02/09 09:37:32	1.20
***************
*** 19,23 ****
                 '  File "%s", line %d, in %s' % (filename,lineno,name))
          if line:
!             _print(file, '    %s' % string.strip(line))
  
  def format_list(extracted_list):
--- 19,23 ----
                 '  File "%s", line %d, in %s' % (filename,lineno,name))
          if line:
!             _print(file, '    %s' % line.strip())
  
  def format_list(extracted_list):
***************
*** 32,36 ****
          item = '  File "%s", line %d, in %s\n' % (filename,lineno,name)
          if line:
!             item = item + '    %s\n' % string.strip(line)
          list.append(item)
      return list
--- 32,36 ----
          item = '  File "%s", line %d, in %s\n' % (filename,lineno,name)
          if line:
!             item = item + '    %s\n' % line.strip()
          list.append(item)
      return list
***************
*** 57,61 ****
                 '  File "%s", line %d, in %s' % (filename,lineno,name))
          line = linecache.getline(filename, lineno)
!         if line: _print(file, '    ' + string.strip(line))
          tb = tb.tb_next
          n = n+1
--- 57,61 ----
                 '  File "%s", line %d, in %s' % (filename,lineno,name))
          line = linecache.getline(filename, lineno)
!         if line: _print(file, '    ' + line.strip())
          tb = tb.tb_next
          n = n+1
***************
*** 86,90 ****
          name = co.co_name
          line = linecache.getline(filename, lineno)
!         if line: line = string.strip(line)
          else: line = None
          list.append((filename, lineno, name, line))
--- 86,90 ----
          name = co.co_name
          line = linecache.getline(filename, lineno)
!         if line: line = line.strip()
          else: line = None
          list.append((filename, lineno, name, line))
***************
*** 158,162 ****
                        line[i] in string.whitespace:
                      i = i+1
!                 list.append('    %s\n' % string.strip(line))
                  s = '    '
                  for c in line[i:offset-1]:
--- 158,162 ----
                        line[i] in string.whitespace:
                      i = i+1
!                 list.append('    %s\n' % line.strip())
                  s = '    '
                  for c in line[i:offset-1]:
***************
*** 247,251 ****
          name = co.co_name
          line = linecache.getline(filename, lineno)
!         if line: line = string.strip(line)
          else: line = None
          list.append((filename, lineno, name, line))
--- 247,251 ----
          name = co.co_name
          line = linecache.getline(filename, lineno)
!         if line: line = line.strip()
          else: line = None
          list.append((filename, lineno, name, line))