Remove some renames

sebastinas · sebastinas · commit 159e1530ef32 · 2021-05-16T22:28:57.000+02:00
diff --git a/bpython/curtsiesfrontend/interaction.py b/bpython/curtsiesfrontend/interaction.py
@@ -3,12 +3,12 @@
 import curtsies.events as events
 
 from ..translations import _
-from ..repl import Interaction as BpythonInteraction
+from ..repl import Interaction
 from ..curtsiesfrontend.events import RefreshRequestEvent
 from ..curtsiesfrontend.manual_readline import edit_keys
 
 
-class StatusBar(BpythonInteraction):
+class StatusBar(Interaction):
     """StatusBar and Interaction for Repl
 
     Passing of control back and forth between calls that use interact api
@@ -157,7 +157,7 @@ def notify(self, msg, n=3, wait_for_keypress=False):
         self.request_refresh()
         self.main_context.switch(msg)
 
-    # below Really ought to be called from greenlets other than main because
+    # below really ought to be called from greenlets other than main because
     # they block
     def confirm(self, q):
         """Expected to return True or False, given question prompt q"""
diff --git a/bpython/curtsiesfrontend/repl.py b/bpython/curtsiesfrontend/repl.py
@@ -1,7 +1,5 @@
-import blessings
 import contextlib
 import errno
-import greenlet
 import itertools
 import logging
 import os
@@ -13,12 +11,8 @@
 import time
 import unicodedata
 
-from pygments import format as pygformat
-from pygments.lexers import Python3Lexer
-from pygments.formatters import TerminalFormatter
-
-from cwcwidth import wcswidth
-
+import blessings
+import greenlet
 from curtsies import (
     FSArray,
     fmtstr,
@@ -30,17 +24,10 @@
 )
 from curtsies.configfile_keynames import keymap as key_dispatch
 from curtsies.input import is_main_thread
-
-from .. import __version__, autocomplete
-from ..repl import (
-    Repl as BpythonRepl,
-    SourceNotFound,
-    LineTypeTranslator as LineType,
-)
-from ..config import getpreferredencoding
-from ..formatter import BPythonFormatter
-from ..translations import _
-from ..pager import get_pager_command
+from cwcwidth import wcswidth
+from pygments import format as pygformat
+from pygments.formatters import TerminalFormatter
+from pygments.lexers import Python3Lexer
 
 from . import events as bpythonevents, sitefix, replpainter as paint
 from .coderunner import (
@@ -49,14 +36,23 @@
 )
 from .filewatch import ModuleChangedEventHandler
 from .interaction import StatusBar
-from .manual_readline import edit_keys
-from .parse import parse as bpythonparse, func_for_letter, color_for_letter
-from .preprocess import preprocess
 from .interpreter import (
     Interp,
     code_finished_will_parse,
 )
-
+from .manual_readline import edit_keys
+from .parse import parse as bpythonparse, func_for_letter, color_for_letter
+from .preprocess import preprocess
+from .. import __version__
+from ..config import getpreferredencoding
+from ..formatter import BPythonFormatter
+from ..pager import get_pager_command
+from ..repl import (
+    Repl,
+    SourceNotFound,
+    LineTypeTranslator as LineType,
+)
+from ..translations import _
 
 logger = logging.getLogger(__name__)
 
@@ -271,7 +267,7 @@ def _find_module(self, fullname, path=None):
             return ImportLoader(self.watcher, loader)
 
 
-class BaseRepl(BpythonRepl):
+class BaseRepl(Repl):
     """Python Repl
 
     Reacts to events like
