From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 25 Apr 2016 10:49:11 +0000 (+0300)
Subject: Remove outdated TkVersion checks.
X-Git-Tag: v3.6.0a1~124
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=159e5359d95a007865fd5367c398aaa1fb00828c;p=thirdparty%2FPython%2Fcpython.git

Remove outdated TkVersion checks.

Minimal supported Tcl/Tk version is 8.4, and this is checked in _tkinter.c.
---

diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 5272b3095a5a..3f242acf78fe 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -1887,9 +1887,6 @@ class Tk(Misc, Wm):
         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
index d2688dba9b54..1e75cae689d4 100644
--- a/Lib/tkinter/commondialog.py
+++ b/Lib/tkinter/commondialog.py
@@ -15,11 +15,6 @@ class Dialog:
     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
index be085abe1dd7..f61c5f7fa9ba 100644
--- 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
index adb629a7c863..8a8ab91f89ce 100644
--- 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)