Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/future/moves/tkinter/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
22 changes: 19 additions & 3 deletions src/tkinter/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 '
Expand Down