From 83e352e1fae2c5df4ec907b8a3355b04b70e669e 2009-07-21 17:45:52
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-07-21 17:45:52
Subject: [PATCH] Fixed import statements for inputhook.

---

diff --git a/IPython/lib/__init__.py b/IPython/lib/__init__.py
index e69de29..2b9ef14 100644
--- a/IPython/lib/__init__.py
+++ b/IPython/lib/__init__.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+# encoding: utf-8
+"""
+Extra capabilities for IPython
+"""
+
+#-----------------------------------------------------------------------------
+#  Copyright (C) 2008-2009  The IPython Development Team
+#
+#  Distributed under the terms of the BSD License.  The full license is in
+#  the file COPYING, distributed as part of this software.
+#-----------------------------------------------------------------------------
+
+#-----------------------------------------------------------------------------
+# Imports
+#-----------------------------------------------------------------------------
+
+from IPython.lib.inputhook import (
+    enable_wx, disable_wx,
+    enable_gtk, disable_gtk,
+    enable_qt4, disable_qt4,
+    enable_tk, disable_tk
+)
+
+#-----------------------------------------------------------------------------
+# Code
+#-----------------------------------------------------------------------------
\ No newline at end of file
diff --git a/IPython/lib/inputhook.py b/IPython/lib/inputhook.py
index a75fdd2..7af65da 100644
--- a/IPython/lib/inputhook.py
+++ b/IPython/lib/inputhook.py
@@ -60,7 +60,7 @@ class InputHookManager(object):
         return original
 
     def enable_wx(self):
-        from IPython.lib.guiloop.inputhookwx import inputhook_wx
+        from IPython.lib.inputhookwx import inputhook_wx
         self.set_inputhook(inputhook_wx)
 
     def disable_wx(self):
@@ -86,7 +86,7 @@ class InputHookManager(object):
             gtk.set_interactive(True)
         except AttributeError:
             # For older versions of gtk, use our own ctypes version
-            from IPython.lib.guiloop.inputhookgtk import inputhook_gtk
+            from IPython.lib.inputhookgtk import inputhook_gtk
             add_inputhook(inputhook_gtk)
 
     def disable_gtk(self):
@@ -107,3 +107,5 @@ enable_qt4 = inputhook_manager.enable_qt4
 disable_qt4 = inputhook_manager.disable_qt4
 enable_gtk = inputhook_manager.enable_gtk
 disable_gtk = inputhook_manager.disable_gtk
+enable_tk = inputhook_manager.enable_tk
+disable_tk = inputhook_manager.disable_tk
\ No newline at end of file