Remove redundant Python 2 code

.gitignore

@@ -21,5 +21,6 b' __pycache__'
 .DS_Store
 \#*#
 .#*
+.cache
 .coverage
 *.swp

IPython/core/magics/script.py

@@ -218,8 +218,8 b' class ScriptMagics(Magics):'
                 print("Error while terminating subprocess (pid=%i): %s" \
                     % (p.pid, e))
             return
-        out = py3compat.bytes_to_str(out)
-        err = py3compat.bytes_to_str(err)
+        out = py3compat.decode(out)
+        err = py3compat.decode(err)
         if args.out:
             self.shell.user_ns[args.out] = out
         else:

IPython/core/tests/test_application.py

@@ -10,7 +10,6 b' from traitlets import Unicode'
 
 from IPython.core.application import BaseIPythonApplication
 from IPython.testing import decorators as dec
-from IPython.utils import py3compat
 from IPython.utils.tempdir import TemporaryDirectory
 
 

IPython/core/tests/test_compilerop.py

@@ -22,7 +22,6 b' import nose.tools as nt'
 
 # Our own imports
 from IPython.core import compilerop
-from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Test functions

IPython/core/tests/test_completerlib.py

@@ -17,7 +17,6 b' from os.path import join'
 import nose.tools as nt
 
 from IPython.core.completerlib import magic_run_completer, module_completion
-from IPython.utils import py3compat
 from IPython.utils.tempdir import TemporaryDirectory
 from IPython.testing.decorators import onlyif_unicode_paths
 

IPython/core/tests/test_history.py

@@ -19,7 +19,6 b' import nose.tools as nt'
 from traitlets.config.loader import Config
 from IPython.utils.tempdir import TemporaryDirectory
 from IPython.core.history import HistoryManager, extract_hist_ranges
-from IPython.utils import py3compat
 
 def setUp():
     nt.assert_equal(sys.getdefaultencoding(), "utf-8")

IPython/core/tests/test_interactiveshell.py

@@ -17,7 +17,6 b' import sys'
 import tempfile
 import unittest
 from unittest import mock
-from io import StringIO
 
 from os.path import join
 
@@ -30,7 +29,6 b' from IPython.testing.decorators import ('
 )
 from IPython.testing import tools as tt
 from IPython.utils.process import find_cmd
-from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Globals

IPython/core/tests/test_oinspect.py

@@ -19,10 +19,8 b' from IPython.core.magic import (Magics, magics_class, line_magic,'
                                 register_line_cell_magic)
 from decorator import decorator
 from IPython import get_ipython
-from IPython.testing.decorators import skipif
 from IPython.testing.tools import AssertPrints, AssertNotPrints
 from IPython.utils.path import compress_user
-from IPython.utils import py3compat
 
 
 #-----------------------------------------------------------------------------
@@ -40,7 +38,7 b' ip = get_ipython()'
 # defined, if any code is inserted above, the following line will need to be
 # updated.  Do NOT insert any whitespace between the next line and the function
 # definition below.
-THIS_LINE_NUMBER = 43  # Put here the actual number of this line
+THIS_LINE_NUMBER = 41  # Put here the actual number of this line
 
 from unittest import TestCase
 

IPython/core/tests/test_splitinput.py

@@ -3,7 +3,6 b' import nose.tools as nt'
 
 from IPython.core.splitinput import split_user_input, LineInfo
 from IPython.testing import tools as tt
-from IPython.utils import py3compat
 
 tests = [
     ('x=1', ('', '', 'x', '=1')),

IPython/core/ultratb.py

@@ -1136,7 +1136,6 b' class VerboseTB(TBTools):'
         colorsnormal = colors.Normal  # used a lot
         head = '%s%s%s' % (colors.topline, '-' * min(75, get_terminal_size()[0]), colorsnormal)
         structured_traceback_parts = [head]
-        if py3compat.PY3:
             chained_exceptions_tb_offset = 0
             lines_of_context = 3
             formatted_exceptions = formatted_exception
@@ -1163,8 +1162,6 b' class VerboseTB(TBTools):'
             # the first exception should be on top
             for formatted_exception in reversed(formatted_exceptions):
                 structured_traceback_parts += formatted_exception
-        else:
-            structured_traceback_parts += formatted_exception[0]
 
         return structured_traceback_parts
 

IPython/extensions/autoreload.py

@@ -116,7 +116,6 b' import traceback'
 import types
 import weakref
 from importlib import import_module
-from IPython.utils.py3compat import PY3
 from imp import reload
 
 from IPython.utils import openpy

IPython/lib/security.py

@@ -11,7 +11,7 b' import random'
 
 # Our own
 from IPython.core.error import UsageError
-from IPython.utils.py3compat import cast_bytes, str_to_bytes
+from IPython.utils.py3compat import encode
 
 #-----------------------------------------------------------------------------
 # Globals
@@ -65,7 +65,7 b" def passwd(passphrase=None, algorithm='sha1'):"
 
     h = hashlib.new(algorithm)
     salt = ('%0' + str(salt_len) + 'x') % random.getrandbits(4 * salt_len)
-    h.update(cast_bytes(passphrase, 'utf-8') + str_to_bytes(salt, 'ascii'))
+    h.update(encode(passphrase, 'utf-8') + encode(salt, 'ascii'))
 
     return ':'.join((algorithm, salt, h.hexdigest()))
 
@@ -109,6 +109,6 b' def passwd_check(hashed_passphrase, passphrase):'
     if len(pw_digest) == 0:
         return False
 
-    h.update(cast_bytes(passphrase, 'utf-8') + cast_bytes(salt, 'ascii'))
+    h.update(encode(passphrase, 'utf-8') + encode(salt, 'ascii'))
 
     return h.hexdigest() == pw_digest

IPython/terminal/interactiveshell.py

@@ -7,7 +7,7 b' from warnings import warn'
 
 from IPython.core.interactiveshell import InteractiveShell, InteractiveShellABC
 from IPython.utils import io
-from IPython.utils.py3compat import input, cast_unicode_py2
+from IPython.utils.py3compat import input
 from IPython.utils.terminal import toggle_set_term_title, set_term_title
 from IPython.utils.process import abbrev_cwd
 from traitlets import (
@@ -233,7 +233,7 b' class TerminalInteractiveShell(InteractiveShell):'
                 prompt_text = "".join(x[1] for x in self.prompts.in_prompt_tokens())
                 prompt_continuation = "".join(x[1] for x in self.prompts.continuation_prompt_tokens())
                 while isp.push_accepts_more():
-                    line = cast_unicode_py2(input(prompt_text))
+                    line = input(prompt_text)
                     isp.push(line)
                     prompt_text = prompt_continuation
                 return isp.source_reset()

IPython/testing/decorators.py

@@ -31,8 +31,9 b" we've copied verbatim from numpy."
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-import sys
 import os
+import shutil
+import sys
 import tempfile
 import unittest
 import warnings
@@ -48,9 +49,6 b' from .ipunittest import ipdoctest, ipdocstring'
 # numpy.testing.decorators, we expose all of it here.
 from IPython.external.decorators import *
 
-# For onlyif_cmd_exists decorator
-from IPython.utils.py3compat import which
-
 #-----------------------------------------------------------------------------
 # Classes and functions
 #-----------------------------------------------------------------------------
@@ -360,7 +358,7 b' def onlyif_cmds_exist(*commands):'
     Decorator to skip test when at least one of `commands` is not found.
     """
     for cmd in commands:
-        if not which(cmd):
+        if not shutil.which(cmd):
             return skip("This test runs only if command '{0}' "
                         "is installed".format(cmd))
     return null_deco
@@ -372,7 +370,7 b' def onlyif_any_cmd_exists(*commands):'
     warnings.warn("The function `onlyif_any_cmd_exists` is deprecated since IPython 4.0",
             DeprecationWarning, stacklevel=2)
     for cmd in commands:
-        if which(cmd):
+        if shutil.which(cmd):
             return null_deco
     return skip("This test runs only if one of the commands {0} "
                 "is installed".format(commands))

IPython/testing/globalipapp.py

@@ -11,13 +11,13 b' done.'
 
 import builtins as builtin_mod
 import sys
+import types
 import warnings
 
 from . import tools
 
 from IPython.core import page
 from IPython.utils import io
-from IPython.utils import py3compat
 from IPython.terminal.interactiveshell import TerminalInteractiveShell
 
 
@@ -104,9 +104,9 b' def start_ipython():'
     # Modify the IPython system call with one that uses getoutput, so that we
     # can capture subcommands and print them to Python's stdout, otherwise the
     # doctest machinery would miss them.
-    shell.system = py3compat.MethodType(xsys, shell)
+    shell.system = types.MethodType(xsys, shell)
     
-    shell._showtraceback = py3compat.MethodType(_showtraceback, shell)
+    shell._showtraceback = types.MethodType(_showtraceback, shell)
 
     # IPython is ready, now clean up some global state...
 

IPython/testing/iptest.py

@@ -34,7 +34,7 b' from nose.plugins import Plugin'
 from nose.util import safe_str
 
 from IPython import version_info
-from IPython.utils.py3compat import bytes_to_str
+from IPython.utils.py3compat import decode
 from IPython.utils.importstring import import_item
 from IPython.testing.plugin.ipdoctest import IPythonDoctest
 from IPython.external.decorators import KnownFailure, knownfailureif
@@ -299,7 +299,7 b' class StreamCapturer(Thread):'
             with self.buffer_lock:
                 self.buffer.write(chunk)
             if self.echo:
-                sys.stdout.write(bytes_to_str(chunk))
+                sys.stdout.write(decode(chunk))
     
         os.close(self.readfd)
         os.close(self.writefd)

IPython/testing/iptestcontroller.py

@@ -24,7 +24,7 b' from .iptest import ('
     have, test_group_names as py_test_group_names, test_sections, StreamCapturer,
 )
 from IPython.utils.path import compress_user
-from IPython.utils.py3compat import bytes_to_str
+from IPython.utils.py3compat import decode
 from IPython.utils.sysinfo import get_sys_info
 from IPython.utils.tempdir import TemporaryDirectory
 
@@ -371,7 +371,7 b' def run_iptestall(options):'
                 print(justify('Test group: ' + controller.section, res_string))
                 if res:
                     controller.print_extra_info()
-                    print(bytes_to_str(controller.stdout))
+                    print(decode(controller.stdout))
                     failed.append(controller)
                     if res == -signal.SIGINT:
                         print("Interrupted")

IPython/testing/tools.py

@@ -33,7 +33,6 b' from IPython.utils.process import get_output_error_code'
 from IPython.utils.text import list_strings
 from IPython.utils.io import temp_pyfile, Tee
 from IPython.utils import py3compat
-from IPython.utils.encoding import DEFAULT_ENCODING
 
 from . import decorators as dec
 from . import skipdoctest
@@ -210,8 +209,8 b' def ipexec(fname, options=None, commands=()):'
         if not isinstance(v, str):
             print(k, v)
     p = Popen(full_cmd, stdout=PIPE, stderr=PIPE, stdin=PIPE, env=env)
-    out, err = p.communicate(input=py3compat.str_to_bytes('\n'.join(commands)) or None)
-    out, err = py3compat.bytes_to_str(out), py3compat.bytes_to_str(err)
+    out, err = p.communicate(input=py3compat.encode('\n'.join(commands)) or None)
+    out, err = py3compat.decode(out), py3compat.decode(err)
     # `import readline` causes 'ESC[?1034h' to be output sometimes,
     # so strip that out before doing comparisons
     if out:

IPython/utils/_process_cli.py

@@ -28,7 +28,7 b' def _find_cmd(cmd):'
     for path in paths:
         filename = os.path.join(path, cmd)
         if System.IO.File.Exists(filename):
-            return py3compat.bytes_to_str(filename)
+            return py3compat.decode(filename)
     raise OSError("command %r not found" % cmd)
 
 def system(cmd):

IPython/utils/_process_common.py

@@ -130,7 +130,7 b' def getoutput(cmd):'
     out = process_handler(cmd, lambda p: p.communicate()[0], subprocess.STDOUT)
     if out is None:
         return ''
-    return py3compat.bytes_to_str(out)
+    return py3compat.decode(out)
 
 
 def getoutputerror(cmd):
@@ -172,7 +172,7 b' def get_output_error_code(cmd):'
     if out_err is None:
         return '', '', p.returncode
     out, err = out_err
-    return py3compat.bytes_to_str(out), py3compat.bytes_to_str(err), p.returncode
+    return py3compat.decode(out), py3compat.decode(err), p.returncode
 
 def arg_split(s, posix=False, strict=True):
     """Split a command line's arguments in a shell-like manner.

IPython/utils/_process_posix.py

@@ -36,7 +36,7 b' def _find_cmd(cmd):'
 
     path = sp.Popen(['/usr/bin/env', 'which', cmd],
                     stdout=sp.PIPE, stderr=sp.PIPE).communicate()[0]
-    return py3compat.bytes_to_str(path)
+    return py3compat.decode(path)
 
 
 class ProcessHandler(object):

IPython/utils/_process_win32.py

@@ -152,7 +152,7 b' def getoutput(cmd):'
 
     if out is None:
         out = b''
-    return py3compat.bytes_to_str(out)
+    return py3compat.decode(out)
 
 try:
     CommandLineToArgvW = ctypes.windll.shell32.CommandLineToArgvW

IPython/utils/_process_win32_controller.py

@@ -15,9 +15,6 b' This file is meant to be used by process.py'
 import os, sys, threading
 import ctypes, msvcrt
 
-# local imports
-from . import py3compat
-
 # Win32 API types needed for the API calls
 from ctypes import POINTER
 from ctypes.wintypes import HANDLE, HLOCAL, LPVOID, WORD, DWORD, BOOL, \

IPython/utils/process.py

@@ -8,6 +8,7 b' Utilities for working with external processes.'
 
 
 import os
+import shutil
 import sys
 
 if sys.platform == 'win32':
@@ -18,7 +19,6 b' else:'
     from ._process_posix import system, getoutput, arg_split, check_pid
 
 from ._process_common import getoutputerror, get_output_error_code, process_handler
-from . import py3compat
 
 
 class FindCmdError(Exception):
@@ -44,7 +44,7 b' def find_cmd(cmd):'
     cmd : str
         The command line program to look for.
     """
-    path = py3compat.which(cmd)
+    path = shutil.which(cmd)
     if path is None:
         raise FindCmdError('command could not be found: %s' % cmd)
     return path

IPython/utils/py3compat.py

@@ -143,7 +143,6 b' def _shutil_which(cmd, mode=os.F_OK | os.X_OK, path=None):'
                     return name
     return None
 
-if sys.version_info[0] >= 3:
     PY3 = True
     
     # keep reference to builtin_mod because the kernel overrides that value
@@ -211,86 +210,6 b' if sys.version_info[0] >= 3:'
         """Get a function's closure attribute"""
         return f.__closure__
 
-else:
-    PY3 = False
-    
-    # keep reference to builtin_mod because the kernel overrides that value
-    # to forward requests to a frontend.
-    def input(prompt=''):
-        return builtin_mod.raw_input(prompt)
-    
-    builtin_mod_name = "__builtin__"
-    import __builtin__ as builtin_mod
-    
-    str_to_unicode = decode
-    unicode_to_str = encode
-    str_to_bytes = no_code
-    bytes_to_str = no_code
-    cast_bytes_py2 = cast_bytes
-    cast_unicode_py2 = cast_unicode
-    buffer_to_bytes_py2 = buffer_to_bytes
-    
-    string_types = (str, unicode)
-    unicode_type = unicode
-    
-    import re
-    _name_re = re.compile(r"[a-zA-Z_][a-zA-Z0-9_]*$")
-    def isidentifier(s, dotted=False):
-        if dotted:
-            return all(isidentifier(a) for a in s.split("."))
-        return bool(_name_re.match(s))
-    
-    xrange = xrange
-    def iteritems(d): return d.iteritems()
-    def itervalues(d): return d.itervalues()
-    getcwd = os.getcwdu
-
-    def MethodType(func, instance):
-        return types.MethodType(func, instance, type(instance))
-    
-    def doctest_refactor_print(func_or_str):
-        return func_or_str
-
-    def get_closure(f):
-        """Get a function's closure attribute"""
-        return f.func_closure
-    
-    which = _shutil_which
-
-    # Abstract u'abc' syntax:
-    @_modify_str_or_docstring
-    def u_format(s):
-        """"{u}'abc'" --> "u'abc'" (Python 2)
-        
-        Accepts a string or a function, so it can be used as a decorator."""
-        return s.format(u='u')
-
-    if sys.platform == 'win32':
-        def execfile(fname, glob=None, loc=None, compiler=None):
-            loc = loc if (loc is not None) else glob
-            scripttext = builtin_mod.open(fname).read()+ '\n'
-            # compile converts unicode filename to str assuming
-            # ascii. Let's do the conversion before calling compile
-            if isinstance(fname, unicode):
-                filename = unicode_to_str(fname)
-            else:
-                filename = fname
-            compiler = compiler or compile
-            exec(compiler(scripttext, filename, 'exec'), glob, loc)
-
-    else:
-        def execfile(fname, glob=None, loc=None, compiler=None):
-            if isinstance(fname, unicode):
-                filename = fname.encode(sys.getfilesystemencoding())
-            else:
-                filename = fname
-            where = [ns for ns in [glob, loc] if ns is not None]
-            if compiler is None:
-                builtin_mod.execfile(filename, *where)
-            else:
-                scripttext = builtin_mod.open(fname).read().rstrip() + '\n'
-                exec(compiler(scripttext, filename, 'exec'), glob, loc)
-
 
 PY2 = not PY3
 PYPY = platform.python_implementation() == "PyPy"

IPython/utils/tokenize2.py

@@ -91,11 +91,7 b" Expfloat = r'[0-9]+' + Exponent"
 Floatnumber = group(Pointfloat, Expfloat)
 Imagnumber = group(r'[0-9]+[jJ]', Floatnumber + r'[jJ]')
 Number = group(Imagnumber, Floatnumber, Intnumber)
-
-if sys.version_info.minor >= 3:
     StringPrefix = r'(?:[bB][rR]?|[rR][bB]?|[uU])?'
-else:
-    StringPrefix = r'(?:[bB]?[rR]?)?'
 
 # Tail end of ' string.
 Single = r"[^'\\]*(?:\\.[^'\\]*)*'"
@@ -165,8 +161,6 b' for t in ("\'", \'"\','
           "bR'", 'bR"', "BR'", 'BR"' ):
     single_quoted[t] = t
 
-if sys.version_info.minor >= 3:
-    # Python 3.3
     for _prefix in ['rb', 'rB', 'Rb', 'RB', 'u', 'U']:
         _t2 = _prefix+'"""'
         endprogs[_t2] = double3prog

setupbase.py

@@ -40,12 +40,6 b' def oscmd(s):'
     print(">", s)
     os.system(s)
 
-# Py3 compatibility hacks, without assuming IPython itself is installed with
-# the full py3compat machinery.
-
-try:
-    execfile
-except NameError:
     def execfile(fname, globs, locs=None):
         locs = locs or globs
         exec(compile(open(fname).read(), fname, "exec"), globs, locs)

tox.ini

@@ -10,7 +10,7 b''
 ; tox -- --all -j  # Runs "iptest --all -j" in every environment
 
 [tox]
-envlist = py{36,35,34,33,27,py}
+envlist = py{36,35,34,33,py}
 skip_missing_interpreters = True
 toxworkdir = /tmp/tox_ipython
 
@@ -19,7 +19,7 b' toxworkdir = /tmp/tox_ipython'
 ; Other IPython/testing dependencies should be in setup.py, not here
 deps =
   pypy: https://bitbucket.org/pypy/numpy/get/master.zip
-  py{36,35,34,33,27}: matplotlib
+  py{36,35,34,33}: matplotlib
   .[test]
 
 ; It's just to avoid loading the IPython package in the current directory