From 3e84f5a2a05e57c7b8a186ccc36fd8d47093df2d 2016-07-29 16:10:02 From: Thomas Kluyver Date: 2016-07-29 16:10:02 Subject: [PATCH] Switch tkinter import based on Python version Rather than try/except, which can cause issues if python-future is installed. Closes gh-9822 --- diff --git a/IPython/terminal/pt_inputhooks/tk.py b/IPython/terminal/pt_inputhooks/tk.py index 24313a8..db205b0 100644 --- a/IPython/terminal/pt_inputhooks/tk.py +++ b/IPython/terminal/pt_inputhooks/tk.py @@ -40,10 +40,12 @@ will fix it for Tk.) """ import time +from IPython.utils.py3compat import PY3 + import _tkinter -try: +if PY3: import tkinter -except ImportError: +else: import Tkinter as tkinter # Python 2 def inputhook(inputhook_context):