Merge pull request #10134 from srinivasreddy/rm_PY3

Remove PY3 variable

IPython/core/completer.py

@@ -35,7 +35,7 b' from IPython.utils import generics'
 from IPython.utils.decorators import undoc
 from IPython.utils.dir2 import dir2, get_real_method
 from IPython.utils.process import arg_split
-from IPython.utils.py3compat import builtin_mod, PY3, cast_unicode_py2
+from IPython.utils.py3compat import builtin_mod, cast_unicode_py2
 from traitlets import Bool, Enum, observe
 
 from functools import wraps
@@ -1172,18 +1172,16 b' class IPCompleter(Completer):'
         if self.use_main_ns:
             self.namespace = __main__.__dict__
 
-        if PY3:
-
-            base_text = text if not line_buffer else line_buffer[:cursor_pos]
-            latex_text, latex_matches = self.latex_matches(base_text)
-            if latex_matches:
-                 return latex_text, latex_matches
-            name_text = ''
-            name_matches = []
-            for meth in (self.unicode_name_matches, back_latex_name_matches, back_unicode_name_matches):
-                name_text, name_matches = meth(base_text)
-                if name_text:
-                    return name_text, name_matches
+        base_text = text if not line_buffer else line_buffer[:cursor_pos]
+        latex_text, latex_matches = self.latex_matches(base_text)
+        if latex_matches:
+            return latex_text, latex_matches
+        name_text = ''
+        name_matches = []
+        for meth in (self.unicode_name_matches, back_latex_name_matches, back_unicode_name_matches):
+            name_text, name_matches = meth(base_text)
+            if name_text:
+                return name_text, name_matches
         
         # if text is either None or an empty string, rely on the line buffer
         if not text:

IPython/core/inputtransformer.py

@@ -6,17 +6,12 b' This includes the machinery to recognise and transform ``%magic`` commands,'
 import abc
 import functools
 import re
+from io import StringIO
 
 from IPython.core.splitinput import LineInfo
 from IPython.utils import tokenize2
-from IPython.utils.py3compat import PY3
 from IPython.utils.tokenize2 import generate_tokens, untokenize, TokenError
 
-if PY3:
-    from io import StringIO
-else:
-    from StringIO import StringIO
-
 #-----------------------------------------------------------------------------
 # Globals
 #-----------------------------------------------------------------------------

IPython/core/magics/execution.py

@@ -36,7 +36,7 b' from IPython.core.magic import (Magics, magics_class, line_magic, cell_magic,'
                                 line_cell_magic, on_off, needs_local_scope)
 from IPython.testing.skipdoctest import skip_doctest
 from IPython.utils import py3compat
-from IPython.utils.py3compat import builtin_mod, PY3
+from IPython.utils.py3compat import builtin_mod
 from IPython.utils.contexts import preserve_keys
 from IPython.utils.capture import capture_output
 from IPython.utils.ipstruct import Struct
@@ -45,11 +45,8 b' from IPython.utils.path import get_py_filename, shellglob'
 from IPython.utils.timing import clock, clock2
 from warnings import warn
 from logging import error
+from io import StringIO
 
-if PY3:
-    from io import StringIO
-else:
-    from StringIO import StringIO
 
 #-----------------------------------------------------------------------------
 # Magic implementation classes
@@ -652,9 +649,6 b' python-profiler package from non-free.""")'
             args = shellglob(map(os.path.expanduser,  arg_lst[1:]))
 
         sys.argv = [filename] + args  # put in the proper filename
-        # protect sys.argv from potential unicode strings on Python 2:
-        if not py3compat.PY3:
-            sys.argv = [ py3compat.cast_bytes(a) for a in sys.argv ]
 
         if 'i' in opts:
             # Run in user's interactive namespace

IPython/core/shellapp.py

@@ -303,9 +303,6 b' class InteractiveShellApp(Configurable):'
         # were run from a system shell.
         save_argv = sys.argv
         sys.argv = [full_filename] + self.extra_args[1:]
-        # protect sys.argv from potential unicode strings on Python 2:
-        if not py3compat.PY3:
-            sys.argv = [ py3compat.cast_bytes(a) for a in sys.argv ]
         try:
             if os.path.isfile(full_filename):
                 self.log.info("Running file in user namespace: %s" %

IPython/core/tests/test_splitinput.py

@@ -28,10 +28,7 b' tests = ['
     ('??%%hist4', ('', '??', '%%hist4', '')),
     ('?x*', ('', '?', 'x*', '')),
     ]
-if py3compat.PY3:
-    tests.append((u"Pérez Fernando", (u'', u'', u'Pérez', u'Fernando')))
-else:
-    tests.append((u"Pérez Fernando", (u'', u'', u'P', u'érez Fernando')))
+tests.append((u"Pérez Fernando", (u'', u'', u'Pérez', u'Fernando')))
 
 def test_split_user_input():
     return tt.check_pairs(split_user_input, tests)

IPython/core/ultratb.py

@@ -298,7 +298,10 b' def getargs(co):'
 
 # Monkeypatch inspect to apply our bugfix.
 def with_patch_inspect(f):
-    """decorator for monkeypatching inspect.findsource"""
+    """
+    Deprecated since IPython 6.0
+    decorator for monkeypatching inspect.findsource
+    """
 
     def wrapped(*args, **kwargs):
         save_findsource = inspect.findsource
@@ -314,16 +317,6 b' def with_patch_inspect(f):'
     return wrapped
 
 
-if py3compat.PY3:
-    fixed_getargvalues = inspect.getargvalues
-else:
-    # Fixes for https://github.com/ipython/ipython/issues/8293
-    #       and https://github.com/ipython/ipython/issues/8205.
-    # The relevant bug is caused by failure to correctly handle anonymous tuple
-    # unpacking, which only exists in Python 2.
-    fixed_getargvalues = with_patch_inspect(inspect.getargvalues)
-
-
 def fix_frame_records_filenames(records):
     """Try to fix the filenames in each record from inspect.getinnerframes().
 
@@ -878,7 +871,7 b' class VerboseTB(TBTools):'
 
         file = py3compat.cast_unicode(file, util_path.fs_encoding)
         link = tpl_link % file
-        args, varargs, varkw, locals = fixed_getargvalues(frame)
+        args, varargs, varkw, locals = inspect.getargvalues(frame)
 
         if func == '?':
             call = ''

IPython/terminal/ptutils.py

@@ -10,8 +10,6 b' not to be used outside IPython.'
 import unicodedata
 from wcwidth import wcwidth
 
-from IPython.utils.py3compat import PY3
-
 from IPython.core.completer import IPCompleter
 from prompt_toolkit.completion import Completer, Completion
 from prompt_toolkit.layout.lexers import Lexer
@@ -78,7 +76,7 b' class IPythonPTLexer(Lexer):'
     """
     def __init__(self):
         l = pygments_lexers
-        self.python_lexer = PygmentsLexer(l.Python3Lexer if PY3 else l.PythonLexer)
+        self.python_lexer = PygmentsLexer(l.Python3Lexer)
         self.shell_lexer = PygmentsLexer(l.BashLexer)
 
         self.magic_lexers = {

IPython/utils/PyColorize.py

@@ -44,14 +44,8 b' import tokenize'
 generate_tokens = tokenize.generate_tokens
 
 from IPython.utils.coloransi import TermColors, InputTermColors ,ColorScheme, ColorSchemeTable
-from IPython.utils.py3compat import PY3
-
 from .colorable import Colorable
-
-if PY3:
-    from io import StringIO
-else:
-    from StringIO import StringIO
+from io import StringIO
 
 #############################################################################
 ### Python Source Parser (does Highlighting)

IPython/utils/capture.py

@@ -6,13 +6,7 b''
 
 
 import sys
-
-from IPython.utils.py3compat import PY3
-
-if PY3:
-    from io import StringIO
-else:
-    from StringIO import StringIO
+from io import StringIO
 
 #-----------------------------------------------------------------------------
 # Classes and functions

IPython/utils/io.py

@@ -17,7 +17,7 b' from warnings import warn'
 
 from IPython.utils.decorators import undoc
 from .capture import CapturedIO, capture_output
-from .py3compat import input, PY3
+from .py3compat import input
 
 @undoc
 class IOStream:

IPython/utils/tests/test_io.py

@@ -9,6 +9,7 b' import io as stdlib_io'
 import os.path
 import stat
 import sys
+from io import StringIO
 
 from subprocess import Popen, PIPE
 import unittest
@@ -17,14 +18,9 b' import nose.tools as nt'
 
 from IPython.testing.decorators import skipif, skip_win32
 from IPython.utils.io import Tee, capture_output
-from IPython.utils.py3compat import doctest_refactor_print, PY3
+from IPython.utils.py3compat import doctest_refactor_print
 from IPython.utils.tempdir import TemporaryDirectory
 
-if PY3:
-    from io import StringIO
-else:
-    from StringIO import StringIO
-
 
 def test_tee_simple():
     "Very simple check with stdout only"

IPython/utils/ulinecache.py

@@ -1,44 +1,25 b''
-"""Wrapper around linecache which decodes files to unicode according to PEP 263.
+"""
+This module has been deprecated since IPython 6.0.
 
-This is only needed for Python 2 - linecache in Python 3 does the same thing
-itself.
+Wrapper around linecache which decodes files to unicode according to PEP 263.
 """
 import functools
 import linecache
 import sys
+from warnings import warn
 
 from IPython.utils import py3compat
 from IPython.utils import openpy
 
-if py3compat.PY3:
-    getline = linecache.getline
-    
-    # getlines has to be looked up at runtime, because doctests monkeypatch it.
-    @functools.wraps(linecache.getlines)
-    def getlines(filename, module_globals=None):
-        return linecache.getlines(filename, module_globals=module_globals)
-
-else:
-    def getlines(filename, module_globals=None):
-        """Get the lines (as unicode) for a file from the cache.
-        Update the cache if it doesn't contain an entry for this file already."""
-        filename = py3compat.cast_bytes(filename, sys.getfilesystemencoding())
-        lines = linecache.getlines(filename, module_globals=module_globals)
-        
-        if (not lines) or isinstance(lines[0], str):
-            return lines
-        
-        readline = openpy._list_readline(lines)
-        try:
-            encoding, _ = openpy.detect_encoding(readline)
-        except SyntaxError:
-            encoding = 'ascii'
-        return [l.decode(encoding, 'replace') for l in lines]
+getline = linecache.getline
 
-    # This is a straight copy of linecache.getline
-    def getline(filename, lineno, module_globals=None):
-        lines = getlines(filename, module_globals)
-        if 1 <= lineno <= len(lines):
-            return lines[lineno-1]
-        else:
-            return ''
+# getlines has to be looked up at runtime, because doctests monkeypatch it.
[e-mail](linecache.getlines)
+def getlines(filename, module_globals=None):
+    """
+    Deprecated since IPython 6.0
+    """
+    warn(("`IPython.utils.ulinecache.getlines` is deprecated since"
+          " IPython 6.0 and will be removed in future versions."),
+         DeprecationWarning, stacklevel=2)
+    return linecache.getlines(filename, module_globals=module_globals)