Repair various failures in the test suite.

IPython/core/interactiveshell.py

@@ -926,7 +926,7 b' class InteractiveShell(SingletonConfigurable, Magic):'
         self.ns_table = {'user':user_ns,
                          'user_global':user_global_ns,
                          'internal':self.internal_ns,
-                         'builtin':__builtin__.__dict__
+                         'builtin':builtin_mod.__dict__
                          }
 
         # Similarly, track all namespaces where references can be held and that
@@ -1050,7 +1050,7 b' class InteractiveShell(SingletonConfigurable, Magic):'
         
         # For more details:
         # http://mail.python.org/pipermail/python-dev/2001-April/014068.html
-        ns = dict(__builtin__ = __builtin__)
+        ns = dict(__builtin__ = builtin_mod)
         
         # Put 'help' in the user namespace
         try:
@@ -1273,7 +1273,7 b' class InteractiveShell(SingletonConfigurable, Magic):'
             # find things in the same order that Python finds them.
             namespaces = [ ('Interactive', self.user_ns),
                            ('IPython internal', self.internal_ns),
-                           ('Python builtin', __builtin__.__dict__),
+                           ('Python builtin', builtin_mod.__dict__),
                            ('Alias', self.alias_manager.alias_table),
                            ]
             alias_ns = self.alias_manager.alias_table

IPython/core/tests/tclass.py

@@ -31,5 +31,5 b' else:'
 
 # This next print statement is NOT debugging, we're making the check on a
 # completely separate process so we verify by capturing stdout:
-print 'ARGV 1-:', sys.argv[1:]
+print('ARGV 1-:', sys.argv[1:])
 sys.stdout.flush()

IPython/frontend/terminal/interactiveshell.py

@@ -27,6 +27,7 b' from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC'
 from IPython.lib.inputhook import enable_gui
 from IPython.lib.pylabtools import pylab_activate
 from IPython.testing.skipdoctest import skip_doctest
+from IPython.utils import py3compat
 from IPython.utils.terminal import toggle_set_term_title, set_term_title
 from IPython.utils.process import abbrev_cwd
 from IPython.utils.warn import warn

IPython/testing/globalipapp.py

@@ -223,8 +223,8 b' def start_ipython():'
     # now return this without recursively calling here again.
     _ip = shell
     get_ipython = _ip.get_ipython
-    __builtin__._ip = _ip
-    __builtin__.get_ipython = get_ipython
+    builtin_mod._ip = _ip
+    builtin_mod.get_ipython = get_ipython
     
     # To avoid extra IPython messages during testing, suppress io.stdout/stderr
     io.stdout = StreamProxy('stdout')

IPython/zmq/session.py

@@ -46,6 +46,7 b' from zmq.eventloop.zmqstream import ZMQStream'
 from IPython.config.configurable import Configurable, LoggingConfigurable
 from IPython.utils.importstring import import_item
 from IPython.utils.jsonutil import extract_dates, squash_dates, date_default
+from IPython.utils.py3compat import str_to_bytes
 from IPython.utils.traitlets import (CBytes, Unicode, Bool, Any, Instance, Set,
                                         DottedObjectName)