fixes or python2->python3, misc linter warnings

Author: bretello

pyrepl/_minimal_curses.py

@@ -45,17 +45,15 @@ def _find_clib():
 
 try:
     from __pypy__ import builtinify
-
-    builtinify  # silence broken pyflakes
 except ImportError:
-    builtinify = lambda f: f
+    def builtinify(f):
+        return f
 
 
 @builtinify
 def setupterm(termstr, fd):
-    if termstr is not None:
-        if not isinstance(termstr, bytes):
-            termstr = termstr.encode()
+    if termstr is not None and not isinstance(termstr, bytes):
+        termstr = termstr.encode()
     err = ctypes.c_int(0)
     result = clib.setupterm(termstr, fd, ctypes.byref(err))
     if result == ERR:

pyrepl/cmdrepl.py

@@ -42,13 +42,13 @@
 
 class CmdReader(CR):
     def collect_keymap(self):
-        return super(CmdReader, self).collect_keymap() + (
+        return super().collect_keymap() + (
             ("\\M-\\n", "invalid-key"),
             ("\\n", "accept"),
         )
 
     def __init__(self, completions):
-        super(CmdReader, self).__init__()
+        super().__init__()
         self.completions = completions
 
     def get_completions(self, stem):
@@ -75,21 +75,21 @@ def replize(klass, history_across_invocations=1):
     #    if klass.cmdloop.im_class is not cmd.Cmd:
     #        print "this may not work"
 
-    class MultiHist(object):
+    class MultiHist:
         __history = []
 
         def __init__(self, *args, **kw):
-            super(MultiHist, self).__init__(*args, **kw)
+            super().__init__(*args, **kw)
             self.__reader = CmdReader(completions)
             self.__reader.history = self.__history
             self.__reader.historyi = len(self.__history)
 
-    class SimpleHist(object):
+    class SimpleHist:
         def __init__(self, *args, **kw):
-            super(SimpleHist, self).__init__(*args, **kw)
+            super().__init__(*args, **kw)
             self.__reader = CmdReader(completions)
 
-    class CmdLoopMixin(object):
+    class CmdLoopMixin:
         def cmdloop(self, intro=None):
             self.preloop()
             if intro is not None:
@@ -115,6 +115,6 @@ def cmdloop(self, intro=None):
     hist = MultiHist if history_across_invocations else SimpleHist
 
     class CmdRepl(hist, CmdLoopMixin, klass):
-        __name__ = "replize(%s.%s)" % (klass.__module__, klass.__name__)
+        __name__ = f"replize({klass.__module__}.{klass.__name__})"
 
     return CmdRepl

pyrepl/commands.py

@@ -20,7 +20,8 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 import os
-import sys
+
+from pyrepl import input  # noqa: F401
 
 # Catgories of actions:
 #  killing
@@ -32,7 +33,7 @@
 # [completion]
 
 
-class Command(object):
+class Command:
     finish = 0
     kills_digit_arg = 1
 
@@ -159,21 +160,21 @@ def do(self):
 class unix_word_rubout(KillCommand):
     def do(self):
         r = self.reader
-        for i in range(r.get_arg()):
+        for _i in range(r.get_arg()):
             self.kill_range(r.bow(), r.pos)
 
 
 class kill_word(KillCommand):
     def do(self):
         r = self.reader
-        for i in range(r.get_arg()):
+        for _i in range(r.get_arg()):
             self.kill_range(r.pos, r.eow())
 
 
 class backward_kill_word(KillCommand):
     def do(self):
         r = self.reader
-        for i in range(r.get_arg()):
+        for _i in range(r.get_arg()):
             self.kill_range(r.bow(), r.pos)
 
 
@@ -232,7 +233,7 @@ def do(self):
 class up(MotionCommand):
     def do(self):
         r = self.reader
-        for i in range(r.get_arg()):
+        for _i in range(r.get_arg()):
             bol1 = r.bol()
             if bol1 == 0:
                 if r.historyi > 0:
@@ -254,7 +255,7 @@ class down(MotionCommand):
     def do(self):
         r = self.reader
         b = r.buffer
-        for i in range(r.get_arg()):
+        for _i in range(r.get_arg()):
             bol1 = r.bol()
             eol1 = r.eol()
             if eol1 == len(b):
@@ -275,7 +276,7 @@ def do(self):
 class left(MotionCommand):
     def do(self):
         r = self.reader
-        for i in range(r.get_arg()):
+        for _i in range(r.get_arg()):
             p = r.pos - 1
             if p >= 0:
                 r.pos = p
@@ -287,7 +288,7 @@ class right(MotionCommand):
     def do(self):
         r = self.reader
         b = r.buffer
-        for i in range(r.get_arg()):
+        for _i in range(r.get_arg()):
             p = r.pos + 1
             if p <= len(b):
                 r.pos = p
@@ -302,7 +303,6 @@ def do(self):
 
 class end_of_line(MotionCommand):
     def do(self):
-        r = self.reader
         self.reader.pos = self.reader.eol()
 
 
@@ -319,14 +319,14 @@ def do(self):
 class forward_word(MotionCommand):
     def do(self):
         r = self.reader
-        for i in range(r.get_arg()):
+        for _i in range(r.get_arg()):
             r.pos = r.eow()
 
 
 class backward_word(MotionCommand):
     def do(self):
         r = self.reader
-        for i in range(r.get_arg()):
+        for _i in range(r.get_arg()):
             r.pos = r.bow()
 
 
@@ -364,7 +364,7 @@ class backspace(EditCommand):
     def do(self):
         r = self.reader
         b = r.buffer
-        for i in range(r.get_arg()):
+        for _i in range(r.get_arg()):
             if r.pos > 0:
                 r.pos -= 1
                 del b[r.pos]
@@ -385,7 +385,7 @@ def do(self):
             r.update_screen()
             r.console.finish()
             raise EOFError
-        for i in range(r.get_arg()):
+        for _i in range(r.get_arg()):
             if r.pos != len(b):
                 del b[r.pos]
                 r.dirty = 1
@@ -423,15 +423,12 @@ def do(self):
 
         r = self.reader
         pending = r.console.getpending().data
-        disp = disp_str((self.event + pending))[0]
+        disp = disp_str(self.event + pending)[0]
         r.insert(disp * r.get_arg())
         r.pop_input_trans()
 
 
-from pyrepl import input
-
-
-class QITrans(object):
+class QITrans:
     def push(self, evt):
         self.evt = evt
 

pyrepl/completer.py

@@ -83,7 +83,7 @@ def attr_matches(self, text):
         n = len(attr)
         for word in words:
             if word[:n] == attr and word != "__builtins__":
-                matches.append("%s.%s" % (expr, word))
+                matches.append(f"{expr}.{word}")
         return matches
 
 

pyrepl/completing_reader.py

@@ -86,7 +86,7 @@ def build_menu(cons, wordlist, start, use_brackets, sort_in_column):
     i = start
     for r in range(rows):
         row = []
-        for col in range(cols):
+        for _col in range(cols):
             row.append(item % left_align(wordlist[i], maxlen))
             i += 1
             if i >= len(wordlist):
@@ -222,10 +222,10 @@ class CompletingReader(Reader):
     sort_in_column = False
 
     def collect_keymap(self):
-        return super(CompletingReader, self).collect_keymap() + ((r"\t", "complete"),)
+        return super().collect_keymap() + ((r"\t", "complete"),)
 
     def __init__(self, console):
-        super(CompletingReader, self).__init__(console)
+        super().__init__(console)
         self.cmpltn_menu = ["[ menu 1 ]", "[ menu 2 ]"]
         self.cmpltn_menu_vis = 0
         self.cmpltn_menu_end = 0
@@ -234,12 +234,12 @@ def __init__(self, console):
             self.commands[c.__name__.replace("_", "-")] = c
 
     def after_command(self, cmd):
-        super(CompletingReader, self).after_command(cmd)
+        super().after_command(cmd)
         if not isinstance(cmd, (complete, self_insert)):
             self.cmpltn_reset()
 
     def calc_screen(self):
-        screen = super(CompletingReader, self).calc_screen()
+        screen = super().calc_screen()
         if self.cmpltn_menu_vis:
             ly = self.lxy[1]
             screen[ly:ly] = self.cmpltn_menu
@@ -248,7 +248,7 @@ def calc_screen(self):
         return screen
 
     def finish(self):
-        super(CompletingReader, self).finish()
+        super().finish()
         self.cmpltn_reset()
 
     def cmpltn_reset(self):

pyrepl/console.py

@@ -18,7 +18,7 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 
-class Event(object):
+class Event:
     """An Event.  `evt' is 'key' or somesuch."""
 
     __slots__ = "evt", "data", "raw"
@@ -29,15 +29,15 @@ def __init__(self, evt, data, raw=""):
         self.raw = raw
 
     def __repr__(self):
-        return "Event(%r, %r)" % (self.evt, self.data)
+        return "Event({self.evt}, {self.data})"
 
     def __eq__(self, other):
         return (
             self.evt == other.evt and self.data == other.data and self.raw == other.raw
         )
 
 
-class Console(object):
+class Console:
     """Attributes:
 
     screen,

pyrepl/historical_reader.py

@@ -43,7 +43,7 @@
 )
 
 if "c" in globals():
-    del c
+    del c  # noqa: F821
 
 ISEARCH_DIRECTION_NONE = ""
 ISEARCH_DIRECTION_BACKWARDS = "r"
@@ -71,11 +71,10 @@ def do(self):
 class restore_history(commands.Command):
     def do(self):
         r = self.reader
-        if r.historyi != len(r.history):
-            if r.get_unicode() != r.history[r.historyi]:
-                r.buffer = list(r.history[r.historyi])
-                r.pos = len(r.buffer)
-                r.dirty = 1
+        if r.historyi != len(r.history) and r.get_unicode() != r.history[r.historyi]:
+            r.buffer = list(r.history[r.historyi])
+            r.pos = len(r.buffer)
+            r.dirty = 1
 
 
 class first_history(commands.Command):
@@ -111,10 +110,7 @@ def do(self):
             return
         w = words[a]
         b = r.buffer
-        if r.yank_arg_i > 0:
-            o = len(r.yank_arg_yanked)
-        else:
-            o = 0
+        o = len(r.yank_arg_yanked) if r.yank_arg_i > 0 else 0
         b[r.pos - o : r.pos] = list(w)
         r.yank_arg_yanked = w
         r.pos += len(w) - o
@@ -212,7 +208,7 @@ class HistoricalReader(R):
     """
 
     def collect_keymap(self):
-        return super(HistoricalReader, self).collect_keymap() + (
+        return super().collect_keymap() + (
             (r"\C-n", "next-history"),
             (r"\C-p", "previous-history"),
             (r"\C-o", "operate-and-get-next"),
@@ -225,7 +221,7 @@ def collect_keymap(self):
         )
 
     def __init__(self, console):
-        super(HistoricalReader, self).__init__(console)
+        super().__init__(console)
         self.history = []
         self.historyi = 0
         self.transient_history = {}
@@ -274,7 +270,7 @@ def get_item(self, i):
             return self.transient_history.get(i, self.get_unicode())
 
     def prepare(self):
-        super(HistoricalReader, self).prepare()
+        super().prepare()
         try:
             self.transient_history = {}
             if self.next_history is not None and self.next_history < len(self.history):
@@ -292,9 +288,9 @@ def prepare(self):
     def get_prompt(self, lineno, cursor_on_line):
         if cursor_on_line and self.isearch_direction != ISEARCH_DIRECTION_NONE:
             d = "rf"[self.isearch_direction == ISEARCH_DIRECTION_FORWARDS]
-            return "(%s-search `%s') " % (d, self.isearch_term)
+            return f"({d}-search `{self.isearch_term}') "
         else:
-            return super(HistoricalReader, self).get_prompt(lineno, cursor_on_line)
+            return super().get_prompt(lineno, cursor_on_line)
 
     def isearch_next(self):
         st = self.isearch_term
@@ -303,10 +299,7 @@ def isearch_next(self):
         s = self.get_unicode()
         forwards = self.isearch_direction == ISEARCH_DIRECTION_FORWARDS
         while 1:
-            if forwards:
-                p = s.find(st, p + 1)
-            else:
-                p = s.rfind(st, 0, p + len(st) - 1)
+            p = s.find(st, p + 1) if forwards else s.rfind(st, 0, p + len(st) - 1)
             if p != -1:
                 self.select_item(i)
                 self.pos = p
@@ -325,7 +318,7 @@ def isearch_next(self):
                     p = len(s)
 
     def finish(self):
-        super(HistoricalReader, self).finish()
+        super().finish()
         ret = self.get_unicode()
         for i, t in list(self.transient_history.items()):
             if i < len(self.history) and i != self.historyi: