Remove PythonLexer from bpython._py3compat

sebastinas · sebastinas · commit 07ec4e95d7c4 · 2020-10-13T21:17:53.000+02:00
diff --git a/bpython/_py3compat.py b/bpython/_py3compat.py
@@ -27,8 +27,6 @@
 
     Defines the following attributes:
 
-    - PythonLexer: Pygment's Python lexer matching the hosting runtime's
-      Python version.
     - py3: True if the hosting Python runtime is of Python version 3 or later
 """
 
@@ -39,12 +37,6 @@
 py3 = sys.version_info[0] == 3
 
 
-if py3:
-    from pygments.lexers import Python3Lexer as PythonLexer
-else:
-    from pygments.lexers import PythonLexer
-
-
 if py3 or sys.version_info[:3] >= (2, 7, 3):
 
     def prepare_for_exec(arg, encoding=None):
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -62,7 +62,8 @@
 # These are used for syntax highlighting
 from pygments import format
 from pygments.formatters import TerminalFormatter
-from ._py3compat import PythonLexer, py3
+from pygments.lexers import Python3Lexer
+from ._py3compat import py3
 from pygments.token import Token
 from .formatter import BPythonFormatter
 
@@ -1001,7 +1002,7 @@ def p_key(self, key):
             else:
                 if config.highlight_show_source:
                     source = format(
-                        PythonLexer().get_tokens(source), TerminalFormatter()
+                        Python3Lexer().get_tokens(source), TerminalFormatter()
                     )
                 page(source)
             return ""
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -12,7 +12,7 @@
 import unicodedata
 
 from pygments import format as pygformat
-from bpython._py3compat import PythonLexer
+from pygments.lexers import Python3Lexer
 from pygments.formatters import TerminalFormatter
 
 from wcwidth import wcswidth
@@ -2013,7 +2013,7 @@ def show_source(self):
         else:
             if self.config.highlight_show_source:
                 source = pygformat(
-                    PythonLexer().get_tokens(source), TerminalFormatter()
+                    Python3Lexer().get_tokens(source), TerminalFormatter()
                 )
             self.pager(source)
 
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -29,9 +29,10 @@
 from collections import namedtuple
 
 from pygments.token import Token
+from pygments.lexers import Python3Lexer
 from types import MemberDescriptorType
 
-from ._py3compat import PythonLexer, py3
+from ._py3compat import py3
 from .lazyre import LazyReCompile
 
 if not py3:
@@ -134,7 +135,7 @@ def __repr__(self):
 
 
 def parsekeywordpairs(signature):
-    tokens = PythonLexer().get_tokens(signature)
+    tokens = Python3Lexer().get_tokens(signature)
     preamble = True
     stack = []
     substack = []
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -40,10 +40,11 @@
 from types import ModuleType
 
 from pygments.token import Token
+from pygments.lexers import Python3Lexer
 
 from . import autocomplete
 from . import inspection
-from ._py3compat import PythonLexer, py3, prepare_for_exec
+from ._py3compat import py3, prepare_for_exec
 from .clipboard import get_clipboard, CopyFailed
 from .config import getpreferredencoding
 from .formatter import Parenthesis
@@ -572,7 +573,7 @@ def _funcname_and_argnum(cls, line):
         # argument so we're done counting
         stack = [["", "", 0, ""]]
         try:
-            for (token, value) in PythonLexer().get_tokens(line):
+            for (token, value) in Python3Lexer().get_tokens(line):
                 if token is Token.Punctuation:
                     if value in "([{":
                         stack.append(["", "", 0, value])
@@ -1079,7 +1080,7 @@ def tokenize(self, s, newline=False):
         if self.cpos:
             cursor += 1
         stack = list()
-        all_tokens = list(PythonLexer().get_tokens(source))
+        all_tokens = list(Python3Lexer().get_tokens(source))
         # Unfortunately, Pygments adds a trailing newline and strings with
         # no size, so strip them
         while not all_tokens[-1][1]:
@@ -1250,7 +1251,7 @@ def next_indentation(line, tab_length):
 def next_token_inside_string(code_string, inside_string):
     """Given a code string s and an initial state inside_string, return
     whether the next token will be inside a string or not."""
-    for token, value in PythonLexer().get_tokens(code_string):
+    for token, value in Python3Lexer().get_tokens(code_string):
         if token is Token.String:
             value = value.lstrip("bBrRuU")
             if value in ['"""', "'''", '"', "'"]:
