summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBrian Curtin <brian.curtin@gmail.com>2011-01-30 19:40:09 (GMT)
committerBrian Curtin <brian.curtin@gmail.com>2011-01-30 19:40:09 (GMT)
commit8ce0fac6c88c1238c2d3c351622feb9ce11302bc (patch)
tree77affe0c9a92a2e6b9ec55734a0f731e2b311cc4 /Lib
parent7a8e21a6ec44cd92c53b25b105be2f0243fbd269 (diff)
downloadcpython-8ce0fac6c88c1238c2d3c351622feb9ce11302bc.zip
cpython-8ce0fac6c88c1238c2d3c351622feb9ce11302bc.tar.gz
cpython-8ce0fac6c88c1238c2d3c351622feb9ce11302bc.tar.bz2
Merged revisions 88258 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88258 | georg.brandl | 2011-01-30 02:16:07 -0600 (Sun, 30 Jan 2011) | 3 lines #11069: fix the IDLE Stack Viewer, by not using "list" as a variable name. Original patch by Brian Curtin, reviewed by me. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/idlelib/RemoteObjectBrowser.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/idlelib/RemoteObjectBrowser.py b/Lib/idlelib/RemoteObjectBrowser.py
index 3d767b3..8031aae 100644
--- a/Lib/idlelib/RemoteObjectBrowser.py
+++ b/Lib/idlelib/RemoteObjectBrowser.py
@@ -17,8 +17,8 @@ class WrappedObjectTreeItem:
return value
def _GetSubList(self):
- list = self.__item._GetSubList()
- return list(map(remote_object_tree_item, list))
+ sub_list = self.__item._GetSubList()
+ return list(map(remote_object_tree_item, sub_list))
class StubObjectTreeItem:
# Lives in IDLE process
@@ -32,5 +32,5 @@ class StubObjectTreeItem:
return value
def _GetSubList(self):
- list = self.sockio.remotecall(self.oid, "_GetSubList", (), {})
- return [StubObjectTreeItem(self.sockio, oid) for oid in list]
+ sub_list = self.sockio.remotecall(self.oid, "_GetSubList", (), {})
+ return [StubObjectTreeItem(self.sockio, oid) for oid in sub_list]