[Python-checkins] r67272 - sandbox/trunk/tkinter-polo/src/tkCommonDialog.py

Wed Nov 19 00:15:10 CET 2008

Author: guilherme.polo
Date: Wed Nov 19 00:15:09 2008
New Revision: 67272
Log:
* Checking for Tk < 4.2 is not needed anymore;
* Dialog subclasses object now;
* Some code relayout
Modified:
 sandbox/trunk/tkinter-polo/src/tkCommonDialog.py
Modified: sandbox/trunk/tkinter-polo/src/tkCommonDialog.py
==============================================================================

--- sandbox/trunk/tkinter-polo/src/tkCommonDialog.py	(original)
+++ sandbox/trunk/tkinter-polo/src/tkCommonDialog.py	Wed Nov 19 00:15:09 2008
@@ -8,19 +8,14 @@
 # written by Fredrik Lundh, May 1997
 #
 
-from Tkinter import *
+from Tkinter import Frame
 
-class Dialog:
+class Dialog(object):
 
 command = None
 
 def __init__(self, master=None, **options):
-
- # FIXME: should this be placed on the module level instead?
- if TkVersion < 4.2:
- raise TclError, "this module requires Tk 4.2 or newer"
-
- self.master = master
+ self.master = master
 self.options = options
 if not master and options.get('parent'):
 self.master = options['parent']
@@ -32,10 +27,8 @@
 return result # hook
 
 def show(self, **options):
-
 # update instance options
- for k, v in options.items():
- self.options[k] = v
+ self.options.update(options)
 
 self._fixoptions()
 
@@ -44,13 +37,10 @@
 w = Frame(self.master)
 
 try:
-
 s = w.tk.call(self.command, *w._options(self.options))
-
 s = self._fixresult(w, s)
 
 finally:
-
 try:
 # get rid of the widget
 w.destroy()
