diff options
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 3 | ||||
| -rw-r--r-- | Lib/idlelib/OutputWindow.py | 5 | ||||
| -rw-r--r-- | Lib/idlelib/PyShell.py | 5 | ||||
| -rw-r--r-- | Lib/idlelib/RemoteObjectBrowser.py | 2 | ||||
| -rw-r--r-- | Lib/idlelib/rpc.py | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index a43929d..27ff6e1 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -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() diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py index 7991e18..ef155a4 100644 --- a/Lib/idlelib/OutputWindow.py +++ b/Lib/idlelib/OutputWindow.py @@ -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 diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py index 70c36fc..f8c73ee 100644 --- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -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 diff --git a/Lib/idlelib/RemoteObjectBrowser.py b/Lib/idlelib/RemoteObjectBrowser.py index bcb9a2e..bf1fb3b 100644 --- a/Lib/idlelib/RemoteObjectBrowser.py +++ b/Lib/idlelib/RemoteObjectBrowser.py @@ -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 diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py index 2f3b56d..037f8b7 100644 --- a/Lib/idlelib/rpc.py +++ b/Lib/idlelib/rpc.py @@ -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 |