##// END OF EJS Templates
Defer import of IPython.lib.inputhook
Thomas Kluyver -
Show More
@@ -358,8 +358,12 b' class TerminalInteractiveShell(InteractiveShell):'
358 using_paste_magics = CBool(False)
358 using_paste_magics = CBool(False)
359
359
360 # In the terminal, GUI control is done via PyOS_InputHook
360 # In the terminal, GUI control is done via PyOS_InputHook
361 from IPython.lib.inputhook import enable_gui
361 def enable_gui(gui=None, app=None):
362 enable_gui = staticmethod(enable_gui)
362 """Switch amongst GUI input hooks by name.
363 """
364 # Deferred import
365 from IPython.lib.inputhook import enable_gui as real_enable_gui
366 return real_enable_gui(gui, app)
363
367
364 def __init__(self, config=None, ipython_dir=None, profile_dir=None,
368 def __init__(self, config=None, ipython_dir=None, profile_dir=None,
365 user_ns=None, user_module=None, custom_exceptions=((),None),
369 user_ns=None, user_module=None, custom_exceptions=((),None),
@@ -14,18 +14,6 b' Extra capabilities for IPython'
14 # Imports
14 # Imports
15 #-----------------------------------------------------------------------------
15 #-----------------------------------------------------------------------------
16
16
17 from IPython.lib.inputhook import (
18 enable_wx, disable_wx,
19 enable_gtk, disable_gtk,
20 enable_qt4, disable_qt4,
21 enable_tk, disable_tk,
22 enable_glut, disable_glut,
23 enable_pyglet, disable_pyglet,
24 enable_gtk3, disable_gtk3,
25 set_inputhook, clear_inputhook,
26 current_gui
27 )
28
29 from IPython.lib.security import passwd
17 from IPython.lib.security import passwd
30
18
31 #-----------------------------------------------------------------------------
19 #-----------------------------------------------------------------------------
General Comments 0
You need to be logged in to leave comments. Login now