py-cvs-2000_07_13 (Rev 1.9) merge

kbkaiser · kbkaiser · commit df8a40fbf57b · 2001-07-14T04:45:32.000Z
"Delete goodname() method, which is unused. Add gotofileline(), a
convenience method which I intend to use in a
variant. Rename test() to _test()."  --GvR

This was an interesting merge. The join completely missed removing
goodname(), which was adjacent, but outside of, a small conflict.
I only caught it by comparing the 1.1.3.2/1.1.3.3 diff.  CVS ain't
infallible.
diff --git a/Lib/idlelib/FileList.py b/Lib/idlelib/FileList.py
@@ -29,15 +29,6 @@ def __init__(self, root):
         self.inversedict = {}
         self.vars = {} # For EditorWindow.getrawvar (shared Tcl variables)
 
-
-    def goodname(self, filename):
-        filename = self.canonize(filename)
-        key = os.path.normcase(filename)
-        if self.dict.has_key(key):
-            edit = self.dict[key]
-            filename = edit.io.filename or filename
-        return filename
-
     def open(self, filename, action=None):
         assert filename
         filename = self.canonize(filename)
@@ -62,6 +53,11 @@ def open(self, filename, action=None):
         else:
             return action(filename)
 
+    def gotofileline(self, filename, lineno=None):
+        edit = self.open(filename)
+        if edit is not None and lineno is not None:
+            edit.gotoline(lineno)
+
     def new(self):
         return self.EditorWindow(self)
 
@@ -131,7 +127,7 @@ def canonize(self, filename):
         return os.path.normpath(filename)
 
 
-def test():
+def _test():
     from EditorWindow import fixwordbreaks
     import sys
     root = Tk()
@@ -147,4 +143,4 @@ def test():
         root.mainloop()
 
 if __name__ == '__main__':
-    test()
+    _test()
