[Python-checkins] r64505 - sandbox/trunk/ttk-gsoc/samples/theming.py

[guilherme.polo]

Author: guilherme.polo
Date: Tue Jun 24 16:30:19 2008
New Revision: 64505

Log:
py3k is supported now

Modified:
   sandbox/trunk/ttk-gsoc/samples/theming.py

Modified: sandbox/trunk/ttk-gsoc/samples/theming.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/theming.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/theming.py	Tue Jun 24 16:30:19 2008
@@ -5,8 +5,12 @@
 import sys
 import ttk
 import pprint
-import Tkinter
-import cStringIO
+try:
+    import cStringIO
+    import Tkinter
+except ImportError:
+    import tkinter as Tkinter
+    import io as cStringIO
 
 def available_widgets():
     """Returns a list of Ttk widgets."""
@@ -101,7 +105,7 @@
         self.master = frame.master
         
         width = 640
-        height = width * 3 / 4
+        height = int(width * 3 / 4)
         self.master.geometry('%dx%d' % (width, height))
         self.master.minsize(width, height)
         self.master.title(title)
@@ -181,7 +185,7 @@
         for widget in self._current_options:
             widget.pack_forget()
         # insert new widgets
-        for opt_name, opt_value in options.iteritems():
+        for opt_name, opt_value in options.items():
             lbl = ttk.Label(frame, text=opt_name)
             entry = ttk.Entry(frame)
             entry.insert(0, opt_value)