[Python-checkins] r63436 - in sandbox/trunk/ttk-gsoc: samples/dirbrowser.py samples/listbox_scrollcmd.py samples/mac_searchentry.py samples/notebook_closebtn.py samples/roundframe.py samples/theme_selector.py samples/treeview_multicolumn.py src/2.x/ttk.py src/3.x/ttk.py

[guilherme.polo]

Author: guilherme.polo
Date: Sat May 17 23:28:32 2008
New Revision: 63436

Log:
Forgot to remove a print =)

Updated samples to work with Tkinter or tkinter


Modified:
   sandbox/trunk/ttk-gsoc/samples/dirbrowser.py
   sandbox/trunk/ttk-gsoc/samples/listbox_scrollcmd.py
   sandbox/trunk/ttk-gsoc/samples/mac_searchentry.py
   sandbox/trunk/ttk-gsoc/samples/notebook_closebtn.py
   sandbox/trunk/ttk-gsoc/samples/roundframe.py
   sandbox/trunk/ttk-gsoc/samples/theme_selector.py
   sandbox/trunk/ttk-gsoc/samples/treeview_multicolumn.py
   sandbox/trunk/ttk-gsoc/src/2.x/ttk.py
   sandbox/trunk/ttk-gsoc/src/3.x/ttk.py

Modified: sandbox/trunk/ttk-gsoc/samples/dirbrowser.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/dirbrowser.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/dirbrowser.py	Sat May 17 23:28:32 2008
@@ -5,10 +5,15 @@
 """
 import os
 import glob
-import Tkinter
 
 import ttk
 
+try:
+    import Tkinter
+except ImportError:
+    import tkinter as Tkinter
+
+
 def populate_tree(tree, node):
     if tree.set(node, "type") != 'directory':
         return

Modified: sandbox/trunk/ttk-gsoc/samples/listbox_scrollcmd.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/listbox_scrollcmd.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/listbox_scrollcmd.py	Sat May 17 23:28:32 2008
@@ -10,7 +10,10 @@
    .l insert end "Line $i of 100"
    }
 """
-import Tkinter
+try:
+    import Tkinter
+except:
+    import tkinter as Tkinter
 
 import ttk
 

Modified: sandbox/trunk/ttk-gsoc/samples/mac_searchentry.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/mac_searchentry.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/mac_searchentry.py	Sat May 17 23:28:32 2008
@@ -1,7 +1,10 @@
 """Mac style search widget
 
 Translated from Tcl code by Schelte Bron, http://wiki.tcl.tk/18188"""
-import Tkinter
+try:
+    import Tkinter
+except ImportError:
+    import tkinter as Tkinter
 
 import ttk
 

Modified: sandbox/trunk/ttk-gsoc/samples/notebook_closebtn.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/notebook_closebtn.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/notebook_closebtn.py	Sat May 17 23:28:32 2008
@@ -3,7 +3,11 @@
 Based on an example by patthoyts, http://paste.tclers.tk/896
 """
 import os
-import Tkinter
+
+try:
+    import Tkinter
+except ImportError:
+    import tkinter as Tkinter
 
 import ttk
 

Modified: sandbox/trunk/ttk-gsoc/samples/roundframe.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/roundframe.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/roundframe.py	Sat May 17 23:28:32 2008
@@ -1,7 +1,10 @@
 """Ttk Frame with rounded corners.
 
 Based on an example by Bryan Oakley, found at: http://wiki.tcl.tk/20152"""
-import Tkinter
+try:
+    import Tkinter
+except ImportError:
+    import tkinter as Tkinter
 
 import ttk
 

Modified: sandbox/trunk/ttk-gsoc/samples/theme_selector.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/theme_selector.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/theme_selector.py	Sat May 17 23:28:32 2008
@@ -5,7 +5,11 @@
 Ttk Label and Ttk Button.
 """
 import sys
-import Tkinter
+
+try:
+    import Tkinter
+except ImportError:
+    import tkinter as Tkinter
 
 import ttk
 

Modified: sandbox/trunk/ttk-gsoc/samples/treeview_multicolumn.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/samples/treeview_multicolumn.py	(original)
+++ sandbox/trunk/ttk-gsoc/samples/treeview_multicolumn.py	Sat May 17 23:28:32 2008
@@ -1,6 +1,10 @@
 """Demo based on the demo mclist.tcl included with tk source distribution."""
-import Tkinter
-import tkFont
+try:
+    import Tkinter
+    import tkFont
+except ImportError:
+    import tkinter as Tkinter
+    import tkinter.font as tkFont
 
 import ttk
 

Modified: sandbox/trunk/ttk-gsoc/src/2.x/ttk.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/src/2.x/ttk.py	(original)
+++ sandbox/trunk/ttk-gsoc/src/2.x/ttk.py	Sat May 17 23:28:32 2008
@@ -238,7 +238,6 @@
             script.append("ttk::style element create %s %s %s %s" % (
                 name, etype, spec, opts))
 
-    print '\n'.join(script)
     return '\n'.join(script)
 
 def _dict_from_tcltuple(t, cut_minus=True):

Modified: sandbox/trunk/ttk-gsoc/src/3.x/ttk.py
==============================================================================
--- sandbox/trunk/ttk-gsoc/src/3.x/ttk.py	(original)
+++ sandbox/trunk/ttk-gsoc/src/3.x/ttk.py	Sat May 17 23:28:32 2008
@@ -238,7 +238,6 @@
             script.append("ttk::style element create %s %s %s %s" % (
                 name, etype, spec, opts))
 
-    print('\n'.join(script))
     return '\n'.join(script)
 
 def _dict_from_tcltuple(t, cut_minus=True):