From: Brian Curtin <brian.curtin@gmail.com>
Date: Sun, 30 Jan 2011 19:40:09 +0000 (+0000)
Subject: Merged revisions 88258 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ce0fac6c88c1238c2d3c351622feb9ce11302bc;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/idlelib/RemoteObjectBrowser.py b/Lib/idlelib/RemoteObjectBrowser.py
index 3d767b32aa3f..8031aaeaf1f2 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]