Fix remaining map() issues.

M    idlelib/PyShell.py
M    idlelib/EditorWindow.py
M    idlelib/rpc.py
M    idlelib/OutputWindow.py
M    idlelib/RemoteObjectBrowser.py
This commit is contained in:
Kurt B. Kaiser 2007-08-09 18:00:23 +00:00
parent 60455b22de
commit 66aaf74e52
5 changed files with 9 additions and 8 deletions

View File

@ -817,8 +817,7 @@ class EditorWindow(object):
"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()

View File

@ -47,8 +47,9 @@ class OutputWindow(EditorWindow):
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

View File

@ -1227,8 +1227,9 @@ class PseudoFile(object):
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

View File

@ -18,7 +18,7 @@ class WrappedObjectTreeItem:
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

View File

@ -288,7 +288,7 @@ class SocketIO(object):
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