[Python-checkins] r68759 - in python/branches/release30-maint: Lib/tkinter/tix.py

Mon Jan 19 07:33:19 CET 2009

Author: hirokazu.yamamoto
Date: Mon Jan 19 07:33:19 2009
New Revision: 68759
Log:
Merged revisions 68477 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r68477 | hirokazu.yamamoto | 2009年01月10日 21:15:23 +0900 | 1 line
 
 Fixed 2to3 issue on tix module.
........
Modified:
 python/branches/release30-maint/ (props changed)
 python/branches/release30-maint/Lib/tkinter/tix.py
Modified: python/branches/release30-maint/Lib/tkinter/tix.py
==============================================================================

--- python/branches/release30-maint/Lib/tkinter/tix.py	(original)
+++ python/branches/release30-maint/Lib/tkinter/tix.py	Mon Jan 19 07:33:19 2009
@@ -293,7 +293,7 @@
 else:
 static_options = ['options']
 
- for k,v in cnf.items()[:]:
+ for k,v in list(cnf.items()):
 if k in static_options:
 extra = extra + ('-' + k, v)
 del cnf[k]
@@ -448,7 +448,7 @@
 # we must be careful not to destroy the frame widget since this
 # also destroys the parent NoteBook thus leading to an exception
 # in Tkinter when it finally calls Tcl to destroy the NoteBook
- for c in self.children.values(): c.destroy()
+ for c in list(self.children.values()): c.destroy()
 if self._name in self.master.children:
 del self.master.children[self._name]
 if self._name in self.master.subwidget_list:
