Skip to content
Browse files

Clear up mistakes from rebasing.

  • Loading branch information...
1 parent 75d1853 commit 9a2ec9f78bf328cdd7f92e7ab1db7a2901b54aee @takluyver committed Oct 4, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 IPython/core/interactiveshell.py
View
4 IPython/core/interactiveshell.py
@@ -978,8 +978,8 @@ class DummyMod(object):
# 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__

0 comments on commit 9a2ec9f

Please sign in to comment.
Something went wrong with that request. Please try again.