Removed python 2 compatibility in introspect

Author: bitagoras

pyPad/introspect.py

@@ -8,11 +8,9 @@
 
 __author__ = "Patrick K. O'Brien <[email protected]>"
 
-import sys
+import io
 import inspect
 import tokenize
-import types
-from six import BytesIO, PY3, string_types
 
 def getAutoCompleteList(command='', locals=None, includeMagic=1,
                         includeSingle=1, includeDouble=1):
@@ -179,7 +177,7 @@ def getCallTip(command='', locals=None):
         pass
     elif inspect.isfunction(obj):
         # tip1 is a string like: "getCallTip(command='', locals=None)"
-        argspec = inspect.getargspec(obj) if not PY3 else inspect.getfullargspec(obj)
+        argspec = inspect.getfullargspec(obj)
         argspec = inspect.formatargspec(*argspec)
         if dropSelf:
             # The first parameter to a method is a reference to an
@@ -226,8 +224,6 @@ def getRoot(command, terminator=None):
     '.'. The terminator and anything after the terminator will be
     dropped."""
     command = command.split('\n')[-1]
-    #if command.startswith(sys.ps2):
-    #    command = command[len(sys.ps2):]
     command = command.lstrip()
     command = rtrimTerminus(command, terminator)
     if terminator == '.':
@@ -265,7 +261,7 @@ def getRoot(command, terminator=None):
         line = token[4]
         if tokentype in (tokenize.ENDMARKER, tokenize.NEWLINE):
             continue
-        if PY3 and tokentype is tokenize.ENCODING:
+        if tokentype is tokenize.ENCODING:
             line = lastline
             break
         if tokentype in (tokenize.NAME, tokenize.STRING, tokenize.NUMBER) \
@@ -311,27 +307,22 @@ def getTokens(command):
     """Return list of token tuples for command."""
 
     # In case the command is unicode try encoding it
-    if isinstance(command,  string_types):
+    if isinstance(command,  str):
         try:
             command = command.encode('utf-8')
         except UnicodeEncodeError:
             pass # otherwise leave it alone
 
-    f = BytesIO(command)
+    f = io.BytesIO(command)
     # tokens is a list of token tuples, each looking like:
     # (type, string, (srow, scol), (erow, ecol), line)
     tokens = []
     # Can't use list comprehension:
     #   tokens = [token for token in tokenize.generate_tokens(f.readline)]
     # because of need to append as much as possible before TokenError.
     try:
-        if not PY3:
-            def eater(*args):
-                tokens.append(args)
-            tokenize.tokenize_loop(f.readline, eater)
-        else:
-            for t in tokenize.tokenize(f.readline):
-                tokens.append(t)
+        for t in tokenize.tokenize(f.readline):
+            tokens.append(t)
     except tokenize.TokenError:
         # This is due to a premature EOF, which we expect since we are
         # feeding in fragments of Python code.

pyPad/pyPadClient.py

@@ -9,7 +9,7 @@
 import traceback
 import textwrap
 import threading
-import introspect
+from . import introspect
 import queue
 
 stdout = sys.stdout