diff --git a/src/future/moves/tkinter/__init__.py b/src/future/moves/tkinter/__init__.py index bc50b4c6..e4082966 100644 --- a/src/future/moves/tkinter/__init__.py +++ b/src/future/moves/tkinter/__init__.py @@ -4,8 +4,24 @@ if not PY3: from Tkinter import * - from Tkinter import (_cnfmerge, _default_root, _flatten, _join, _setit, - _splitdict, _stringify, _support_default_root, _test, - _tkinter) + from Tkinter import (_cnfmerge, _default_root, _flatten, + _support_default_root, _test, + _tkinter, _setit) + + try: # >= 2.7.4 + from Tkinter import (_join) + except ImportError: + pass + + try: # >= 2.7.4 + from Tkinter import (_stringify) + except ImportError: + pass + + try: # >= 2.7.9 + from Tkinter import (_splitdict) + except ImportError: + pass + else: from tkinter import * diff --git a/src/tkinter/__init__.py b/src/tkinter/__init__.py index d0e1b0af..bb730c35 100644 --- a/src/tkinter/__init__.py +++ b/src/tkinter/__init__.py @@ -3,9 +3,25 @@ if sys.version_info[0] < 3: from Tkinter import * - from Tkinter import (_cnfmerge, _default_root, _flatten, _join, _setit, - _splitdict, _stringify, _support_default_root, _test, - _tkinter) + from Tkinter import (_cnfmerge, _default_root, _flatten, + _support_default_root, _test, + _tkinter, _setit) + + try: # >= 2.7.4 + from Tkinter import (_join) + except ImportError: + pass + + try: # >= 2.7.4 + from Tkinter import (_stringify) + except ImportError: + pass + + try: # >= 2.7.9 + from Tkinter import (_splitdict) + except ImportError: + pass + else: raise ImportError('This package should not be accessible on Python 3. ' 'Either you are trying to run from the python-future src folder '