[Python-checkins] r64504 - in sandbox/trunk/ttk-gsoc/src: 2.x/ttk.py 3.x/ttk.py

[guilherme.polo]

Author: guilherme.polo
Date: Tue Jun 24 16:29:28 2008
New Revision: 64504

Log:
Padding may take other formats beyond int values, adjusted the code for handling it.

Modified:
   sandbox/trunk/ttk-gsoc/src/2.x/ttk.py
   sandbox/trunk/ttk-gsoc/src/3.x/ttk.py

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	Tue Jun 24 16:29:28 2008
@@ -268,7 +268,11 @@
             if val[0].typename == 'StateSpec':
                 val = _list_from_statespec(val)
             else: # could be padding
-                val = map(int, map(str, val))
+                val = map(str, val)
+                try:
+                    val = map(int, val)
+                except ValueError:
+                    pass
 
         elif hasattr(val, 'typename'):
             # some other Tcl object

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	Tue Jun 24 16:29:28 2008
@@ -268,7 +268,11 @@
             if val[0].typename == 'StateSpec':
                 val = _list_from_statespec(val)
             else: # could be padding
-                val = map(int, map(str, val))
+                val = list(map(str, val))
+                try:
+                    val = list(map(int, val))
+                except ValueError:
+                    pass
 
         elif hasattr(val, 'typename'):
             # some other Tcl object