Fix remaining map() issues.

kbkaiser · kbkaiser · commit 66aaf74e52d3 · 2007-08-09T18:00:23.000Z
M    idlelib/PyShell.py
M    idlelib/EditorWindow.py
M    idlelib/rpc.py
M    idlelib/OutputWindow.py
M    idlelib/RemoteObjectBrowser.py
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
@@ -817,8 +817,7 @@ def get_geometry(self):
         "Return (width, height, x, y)"
         geom = self.top.wm_geometry()
         m = re.match(r"(\d+)x(\d+)\+(-?\d+)\+(-?\d+)", geom)
-        tuple = (map(int, m.groups()))
-        return tuple
+        return list(map(int, m.groups()))
 
     def close_event(self, event):
         self.close()
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
@@ -47,8 +47,9 @@ def write(self, s, tags=(), mark="insert"):
         self.text.see(mark)
         self.text.update()
 
-    def writelines(self, l):
-        map(self.write, l)
+    def writelines(self, lines):
+        for line in lines:
+            self.write(line)
 
     def flush(self):
         pass
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
@@ -1227,8 +1227,9 @@ def __init__(self, shell, tags, encoding=None):
     def write(self, s):
         self.shell.write(s, self.tags)
 
-    def writelines(self, l):
-        map(self.write, l)
+    def writelines(self, lines):
+        for line in lines:
+            self.write(line)
 
     def flush(self):
         pass
diff --git a/Lib/idlelib/RemoteObjectBrowser.py b/Lib/idlelib/RemoteObjectBrowser.py
@@ -18,7 +18,7 @@ def __getattr__(self, name):
 
     def _GetSubList(self):
         list = self.__item._GetSubList()
-        return map(remote_object_tree_item, list)
+        return list(map(remote_object_tree_item, list))
 
 class StubObjectTreeItem:
     # Lives in IDLE process
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
@@ -288,7 +288,7 @@ def _proxify(self, obj):
         if isinstance(obj, RemoteProxy):
             return RPCProxy(self, obj.oid)
         if isinstance(obj, list):
-            return map(self._proxify, obj)
+            return list(map(self._proxify, obj))
         # XXX Check for other types -- not currently needed
         return obj
 
