From 010073cf6d10fda2f40615a000f59b251855b799 2011-12-28 18:32:56
From: Thomas Kluyver <takowl@gmail.com>
Date: 2011-12-28 18:32:56
Subject: [PATCH] Tweak import statement so 2to3 from Python 3.1 doesn't mangle it.

Closes gh-1197

---

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 58681c9..939a132 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -1953,7 +1953,7 @@ class InteractiveShell(SingletonConfigurable, Magic):
         # even need a centralize colors management object.
         self.magic_colors(self.colors)
         # History was moved to a separate module
-        from . import history
+        from IPython.core import history
         history.init_ipython(self)
 
     def magic(self, arg_s, next_input=None):