From 9a2ec9f78bf328cdd7f92e7ab1db7a2901b54aee 2011-11-27 01:00:25
From: Thomas Kluyver <takowl@gmail.com>
Date: 2011-11-27 01:00:25
Subject: [PATCH] Clear up mistakes from rebasing.

---

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index dcf6914..eca8be2 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -978,8 +978,8 @@ class InteractiveShell(SingletonConfigurable, Magic):
         # We must ensure that __builtin__ (without the final 's') is always
         # available and pointing to the __builtin__ *module*.  For more details:
         # http://mail.python.org/pipermail/python-dev/2001-April/014068.html
-        user_module.__dict__.setdefault('__builtin__',__builtin__)
-        user_module.__dict__.setdefault('__builtins__',__builtin__)
+        user_module.__dict__.setdefault('__builtin__', builtin_mod)
+        user_module.__dict__.setdefault('__builtins__', builtin_mod)
         
         if user_ns is None:
             user_ns = user_module.__dict__