Remove redundant Python 2 code

hugovk · hugovk · commit 77b36a9fd110 · 2017-10-25T16:14:22.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -21,5 +21,6 @@ __pycache__
 .DS_Store
 \#*#
 .#*
+.cache
 .coverage
 *.swp
diff --git a/IPython/core/magics/script.py b/IPython/core/magics/script.py
@@ -218,8 +218,8 @@ def shebang(self, line, cell):
                 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:
diff --git a/IPython/core/tests/test_application.py b/IPython/core/tests/test_application.py
@@ -10,7 +10,6 @@
 
 from IPython.core.application import BaseIPythonApplication
 from IPython.testing import decorators as dec
-from IPython.utils import py3compat
 from IPython.utils.tempdir import TemporaryDirectory
 
 
diff --git a/IPython/core/tests/test_compilerop.py b/IPython/core/tests/test_compilerop.py
@@ -22,7 +22,6 @@
 
 # Our own imports
 from IPython.core import compilerop
-from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Test functions
diff --git a/IPython/core/tests/test_completerlib.py b/IPython/core/tests/test_completerlib.py
@@ -17,7 +17,6 @@
 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
 
diff --git a/IPython/core/tests/test_history.py b/IPython/core/tests/test_history.py
@@ -19,7 +19,6 @@
 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")
diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
@@ -17,7 +17,6 @@
 import tempfile
 import unittest
 from unittest import mock
-from io import StringIO
 
 from os.path import join
 
@@ -30,7 +29,6 @@
 )
 from IPython.testing import tools as tt
 from IPython.utils.process import find_cmd
-from IPython.utils import py3compat
 
 #-----------------------------------------------------------------------------
 # Globals
diff --git a/IPython/core/tests/test_oinspect.py b/IPython/core/tests/test_oinspect.py
@@ -19,10 +19,8 @@
                                 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,14 +38,14 @@
 # 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
 
 class Test(TestCase):
 
     def test_find_source_lines(self):
-        self.assertEqual(oinspect.find_source_lines(Test.test_find_source_lines), 
+        self.assertEqual(oinspect.find_source_lines(Test.test_find_source_lines),
                     THIS_LINE_NUMBER+6)
 
 
diff --git a/IPython/core/tests/test_splitinput.py b/IPython/core/tests/test_splitinput.py
@@ -3,7 +3,6 @@
 
 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')),
diff --git a/IPython/core/ultratb.py b/IPython/core/ultratb.py
@@ -1136,35 +1136,32 @@ def structured_traceback(self, etype, evalue, etb, tb_offset=None,
         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
+        chained_exceptions_tb_offset = 0
+        lines_of_context = 3
+        formatted_exceptions = formatted_exception
+        exception = self.get_parts_of_chained_exception(evalue)
+        if exception:
+            formatted_exceptions += self.prepare_chained_exception_message(evalue.__cause__)
+            etype, evalue, etb = exception
+        else:
+            evalue = None
+        chained_exc_ids = set()
+        while evalue:
+            formatted_exceptions += self.format_exception_as_a_whole(etype, evalue, etb, lines_of_context,
+                                                                     chained_exceptions_tb_offset)
             exception = self.get_parts_of_chained_exception(evalue)
-            if exception:
+
+            if exception and not id(exception[1]) in chained_exc_ids:
+                chained_exc_ids.add(id(exception[1])) # trace exception to avoid infinite 'cause' loop
                 formatted_exceptions += self.prepare_chained_exception_message(evalue.__cause__)
                 etype, evalue, etb = exception
             else:
                 evalue = None
-            chained_exc_ids = set()
-            while evalue:
-                formatted_exceptions += self.format_exception_as_a_whole(etype, evalue, etb, lines_of_context,
-                                                                         chained_exceptions_tb_offset)
-                exception = self.get_parts_of_chained_exception(evalue)
-
-                if exception and not id(exception[1]) in chained_exc_ids:
-                    chained_exc_ids.add(id(exception[1])) # trace exception to avoid infinite 'cause' loop
-                    formatted_exceptions += self.prepare_chained_exception_message(evalue.__cause__)
-                    etype, evalue, etb = exception
-                else:
-                    evalue = None
 
-            # we want to see exceptions in a reversed order:
-            # 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]
+        # we want to see exceptions in a reversed order:
+        # the first exception should be on top
+        for formatted_exception in reversed(formatted_exceptions):
+            structured_traceback_parts += formatted_exception
 
         return structured_traceback_parts
 
diff --git a/IPython/extensions/autoreload.py b/IPython/extensions/autoreload.py
@@ -116,7 +116,6 @@
 import types
 import weakref
 from importlib import import_module
-from IPython.utils.py3compat import PY3
 from imp import reload
 
 from IPython.utils import openpy
diff --git a/IPython/lib/security.py b/IPython/lib/security.py
@@ -11,7 +11,7 @@
 
 # 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 @@ 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 @@ 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
diff --git a/IPython/terminal/interactiveshell.py b/IPython/terminal/interactiveshell.py
@@ -7,7 +7,7 @@
 
 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 @@ def prompt():
                 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()
diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py
@@ -31,8 +31,9 @@
 # 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 @@
 # 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 @@ 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 @@ 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))
diff --git a/IPython/testing/globalipapp.py b/IPython/testing/globalipapp.py
@@ -11,13 +11,13 @@
 
 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 @@ 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._showtraceback = py3compat.MethodType(_showtraceback, shell)
+    shell.system = types.MethodType(xsys, shell)
+
+    shell._showtraceback = types.MethodType(_showtraceback, shell)
 
     # IPython is ready, now clean up some global state...
 
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
@@ -34,7 +34,7 @@
 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,8 +299,8 @@ def run(self):
             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)
 
diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
@@ -24,7 +24,7 @@
     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 @@ def justify(ltext, rtext, width=70, fill='-'):
                 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")
diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py
@@ -33,7 +33,6 @@
 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 @@ 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:
diff --git a/IPython/utils/_process_cli.py b/IPython/utils/_process_cli.py
@@ -28,7 +28,7 @@ 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):
diff --git a/IPython/utils/_process_common.py b/IPython/utils/_process_common.py
@@ -130,7 +130,7 @@ 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 @@ 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.
diff --git a/IPython/utils/_process_posix.py b/IPython/utils/_process_posix.py
@@ -36,7 +36,7 @@ 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):
diff --git a/IPython/utils/_process_win32.py b/IPython/utils/_process_win32.py
@@ -152,7 +152,7 @@ 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
diff --git a/IPython/utils/_process_win32_controller.py b/IPython/utils/_process_win32_controller.py
@@ -15,9 +15,6 @@
 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, \
diff --git a/IPython/utils/process.py b/IPython/utils/process.py
diff --git a/IPython/utils/py3compat.py b/IPython/utils/py3compat.py
diff --git a/IPython/utils/tokenize2.py b/IPython/utils/tokenize2.py
diff --git a/setupbase.py b/setupbase.py
diff --git a/tox.ini b/tox.ini
