[Python-3000-checkins] r56862 - python/branches/py3k/Lib/idlelib/EditorWindow.py python/branches/py3k/Lib/idlelib/OutputWindow.py python/branches/py3k/Lib/idlelib/PyShell.py python/branches/py3k/Lib/idlelib/RemoteObjectBrowser.py python/branches/py3k/Lib/idlelib/rpc.py

[kurt.kaiser]

Author: kurt.kaiser
Date: Thu Aug  9 20:00:23 2007
New Revision: 56862

Modified:
   python/branches/py3k/Lib/idlelib/EditorWindow.py
   python/branches/py3k/Lib/idlelib/OutputWindow.py
   python/branches/py3k/Lib/idlelib/PyShell.py
   python/branches/py3k/Lib/idlelib/RemoteObjectBrowser.py
   python/branches/py3k/Lib/idlelib/rpc.py
Log:
Fix remaining map() issues.

M    idlelib/PyShell.py
M    idlelib/EditorWindow.py
M    idlelib/rpc.py
M    idlelib/OutputWindow.py
M    idlelib/RemoteObjectBrowser.py


Modified: python/branches/py3k/Lib/idlelib/EditorWindow.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/EditorWindow.py	(original)
+++ python/branches/py3k/Lib/idlelib/EditorWindow.py	Thu Aug  9 20:00:23 2007
@@ -817,8 +817,7 @@
         "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()

Modified: python/branches/py3k/Lib/idlelib/OutputWindow.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/OutputWindow.py	(original)
+++ python/branches/py3k/Lib/idlelib/OutputWindow.py	Thu Aug  9 20:00:23 2007
@@ -47,8 +47,9 @@
         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

Modified: python/branches/py3k/Lib/idlelib/PyShell.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/PyShell.py	(original)
+++ python/branches/py3k/Lib/idlelib/PyShell.py	Thu Aug  9 20:00:23 2007
@@ -1227,8 +1227,9 @@
     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

Modified: python/branches/py3k/Lib/idlelib/RemoteObjectBrowser.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/RemoteObjectBrowser.py	(original)
+++ python/branches/py3k/Lib/idlelib/RemoteObjectBrowser.py	Thu Aug  9 20:00:23 2007
@@ -18,7 +18,7 @@
 
     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

Modified: python/branches/py3k/Lib/idlelib/rpc.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/rpc.py	(original)
+++ python/branches/py3k/Lib/idlelib/rpc.py	Thu Aug  9 20:00:23 2007
@@ -288,7 +288,7 @@
         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