Merge Py Idle changes:

Rev 1.17 doerwalter
(string methods)

diff --git a/Lib/idlelib/StackViewer.py b/Lib/idlelib/StackViewer.py
index b8d356fe2ad93a7c1a45ff80827a3b354ddeb57b..5807707d742f7373fe237db6f32208cb4e66fd51 100644 (file)
--- a/Lib/idlelib/StackViewer.py
+++ b/Lib/idlelib/StackViewer.py
@@ -1,6 +1,5 @@
 import os
 import sys
-import string
 import linecache
 
 from TreeWidget import TreeNode, TreeItem, ScrolledCanvas
@@ -49,7 +48,7 @@ class FrameTreeItem(TreeItem):
         filename = code.co_filename
         funcname = code.co_name
         sourceline = linecache.getline(filename, lineno)
-        sourceline = string.strip(sourceline)
+        sourceline = sourceline.strip()
         if funcname in ("?", "", None):
             item = "%s, line %d: %s" % (modname, lineno, sourceline)
         else: