[Python-checkins] r88269 - in python/branches/release31-maint: Lib/idlelib/RemoteObjectBrowser.py

[brian.curtin]

Author: brian.curtin
Date: Sun Jan 30 20:40:09 2011
New Revision: 88269

Log:
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.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/idlelib/RemoteObjectBrowser.py

Modified: python/branches/release31-maint/Lib/idlelib/RemoteObjectBrowser.py
==============================================================================
--- python/branches/release31-maint/Lib/idlelib/RemoteObjectBrowser.py	(original)
+++ python/branches/release31-maint/Lib/idlelib/RemoteObjectBrowser.py	Sun Jan 30 20:40:09 2011
@@ -17,8 +17,8 @@
         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 @@
         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]