[Python-checkins] cpython: Remove outdated TkVersion checks.

Mon Apr 25 07:02:08 EDT 2016

https://hg.python.org/cpython/rev/7d3fba5f8070
changeset: 101135:7d3fba5f8070
parent: 101133:049463a379cc
user: Serhiy Storchaka <storchaka at gmail.com>
date: Mon Apr 25 13:49:11 2016 +0300
summary:
 Remove outdated TkVersion checks.
Minimal supported Tcl/Tk version is 8.4, and this is checked in _tkinter.c.
files:
 Lib/tkinter/__init__.py | 3 ---
 Lib/tkinter/commondialog.py | 5 -----
 Lib/tkinter/dialog.py | 5 +----
 Lib/tkinter/tix.py | 4 ----
 4 files changed, 1 insertions(+), 16 deletions(-)

diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -1887,9 +1887,6 @@
 if tcl_version != _tkinter.TCL_VERSION:
 raise RuntimeError("tcl.h version (%s) doesn't match libtcl.a version (%s)" \
 % (_tkinter.TCL_VERSION, tcl_version))
- if TkVersion < 4.0:
- raise RuntimeError("Tk 4.0 or higher is required; found Tk %s"
- % str(TkVersion))
 # Create and register the tkerror and exit commands
 # We need to inline parts of _register here, _ register
 # would register differently-named commands.
diff --git a/Lib/tkinter/commondialog.py b/Lib/tkinter/commondialog.py
--- a/Lib/tkinter/commondialog.py
+++ b/Lib/tkinter/commondialog.py
@@ -15,11 +15,6 @@
 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.options = options
 if not master and options.get('parent'):
diff --git a/Lib/tkinter/dialog.py b/Lib/tkinter/dialog.py
--- a/Lib/tkinter/dialog.py
+++ b/Lib/tkinter/dialog.py
@@ -3,10 +3,7 @@
 from tkinter import *
 from tkinter import _cnfmerge
 
-if TkVersion <= 3.6:
- DIALOG_ICON = 'warning'
-else:
- DIALOG_ICON = 'questhead'
+DIALOG_ICON = 'questhead'
 
 
 class Dialog(Widget):
diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -29,10 +29,6 @@
 from tkinter import *
 from tkinter import _cnfmerge, _default_root
 
-# WARNING - TkVersion is a limited precision floating point number
-if TkVersion < 3.999:
- raise ImportError("This version of Tix.py requires Tk 4.0 or higher")
-
 import _tkinter # If this fails your Python may not be configured for Tk
 
 # Some more constants (for consistency with Tkinter)
-- 
Repository URL: https://hg.python.org/cpython
