Fix PEP8 issues

sebastinas · sebastinas · commit c85c4e76af78 · 2018-05-20T23:24:24.000+02:00
diff --git a/bpython/_internal.py b/bpython/_internal.py
@@ -27,6 +27,7 @@ def __repr__(self):
     def __call__(self, *args, **kwargs):
         self.helper(*args, **kwargs)
 
+
 _help = _Helper()
 
 
diff --git a/bpython/_py3compat.py b/bpython/_py3compat.py
@@ -76,4 +76,3 @@ def is_main_thread():
 else:
     def is_main_thread():
         return isinstance(threading.current_thread(), threading._MainThread)
-
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -52,9 +52,9 @@
 
 import struct
 if platform.system() != 'Windows':
-    import signal      #Windows does not have job control
-    import termios     #Windows uses curses
-    import fcntl       #Windows uses curses
+    import signal  # Windows does not have job control
+    import termios  # Windows uses curses
+    import fcntl  # Windows uses curses
 import unicodedata
 import errno
 
@@ -112,6 +112,7 @@ def calculate_screen_lines(tokens, width, cursor=0):
             pos %= width
     return lines
 
+
 def forward_if_not_current(func):
     @functools.wraps(func)
     def newfunc(self, *args, **kwargs):
@@ -202,7 +203,7 @@ def readline(self, size=-1):
                     # C-d
                     return ''
                 elif (key not in ('\n', '\r') and
-                    (len(key) > 1 or unicodedata.category(key) == 'Cc')):
+                      (len(key) > 1 or unicodedata.category(key) == 'Cc')):
                     continue
                 sys.stdout.write(key)
                 # Include the \n in the buffer - raw_input() seems to deal with trailing
@@ -281,7 +282,7 @@ def make_colors(config):
 
     if platform.system() == 'Windows':
         c = dict(list(c.items()) +
-            [
+                 [
             ('K', 8),
             ('R', 9),
             ('G', 10),
@@ -290,8 +291,8 @@ def make_colors(config):
             ('M', 13),
             ('C', 14),
             ('W', 15),
-            ]
-         )
+        ]
+        )
 
     for i in range(63):
         if i > 7:
@@ -316,7 +317,6 @@ def confirm(self, q):
 
         return reply.lower() in (_('y'), _('yes'))
 
-
     def notify(self, s, n=10, wait_for_keypress=False):
         return self.statusbar.message(s, n)
 
@@ -350,6 +350,7 @@ def __init__(self, scr, interp, statusbar, config, idle=None):
 
     def _get_cursor_offset(self):
         return len(self.s) - self.cpos
+
     def _set_cursor_offset(self, offset):
         self.cpos = len(self.s) - offset
     cursor_offset = property(_get_cursor_offset, _set_cursor_offset, None,
@@ -427,7 +428,7 @@ def check(self):
         it and force syntax highlighting."""
 
         if (self.paste_mode
-            and time.time() - self.last_key_press > self.config.paste_time):
+                and time.time() - self.last_key_press > self.config.paste_time):
             self.paste_mode = False
             self.print_line(self.s)
 
@@ -454,7 +455,7 @@ def complete(self, tab=False):
         with tab
         """
         if self.paste_mode:
-            self.scr.touchwin() #TODO necessary?
+            self.scr.touchwin()  # TODO necessary?
             return
 
         list_win_visible = repl.Repl.complete(self, tab)
@@ -489,6 +490,7 @@ def clrtobol(self):
 
     def _get_current_line(self):
         return self.s
+
     def _set_current_line(self, line):
         self.s = line
     current_line = property(_get_current_line, _set_current_line, None,
@@ -716,7 +718,7 @@ def mkargspec(self, topline, in_arg, down):
 
         self.list_win.addstr('\n  ')
         self.list_win.addstr(fn,
-            get_colpair(self.config, 'name') | curses.A_BOLD)
+                             get_colpair(self.config, 'name') | curses.A_BOLD)
         self.list_win.addstr(': (', get_colpair(self.config, 'name'))
         maxh = self.scr.getmaxyx()[0]
 
@@ -765,7 +767,7 @@ def mkargspec(self, topline, in_arg, down):
             if kw is not None:
                 self.list_win.addstr('=', punctuation_colpair)
                 self.list_win.addstr(kw, get_colpair(self.config, 'token'))
-            if k != len(args) -1:
+            if k != len(args) - 1:
                 self.list_win.addstr(', ', punctuation_colpair)
 
         if _args:
@@ -854,7 +856,7 @@ def p_key(self, key):
             key = '\n'
             # Don't return; let it get handled
 
-        if key == chr(27): #Escape Key
+        if key == chr(27):  # Escape Key
             return ''
 
         if key in (BACKSP, 'KEY_BACKSPACE'):
@@ -894,7 +896,7 @@ def p_key(self, key):
             self.fwd()
             return ''
 
-        elif key in ("KEY_LEFT",' ^B', chr(2)):  # Cursor Left or ^B
+        elif key in ("KEY_LEFT", ' ^B', chr(2)):  # Cursor Left or ^B
             self.mvc(1)
             # Redraw (as there might have been highlighted parens)
             self.print_line(self.s)
@@ -914,11 +916,11 @@ def p_key(self, key):
             # Redraw (as there might have been highlighted parens)
             self.print_line(self.s)
 
-        elif key in ("KEY_NPAGE", '\T'): # page_down or \T
+        elif key in ("KEY_NPAGE", '\T'):  # page_down or \T
             self.hend()
             self.print_line(self.s)
 
-        elif key in ("KEY_PPAGE", '\S'): # page_up or \S
+        elif key in ("KEY_PPAGE", '\S'):  # page_up or \S
             self.hbegin()
             self.print_line(self.s)
 
@@ -1065,7 +1067,8 @@ def print_line(self, s, clr=False, newline=False):
     def prompt(self, more):
         """Show the appropriate Python prompt"""
         if not more:
-            self.echo("\x01%s\x03%s" % (self.config.color_scheme['prompt'], self.ps1))
+            self.echo("\x01%s\x03%s" %
+                      (self.config.color_scheme['prompt'], self.ps1))
             if py3:
                 self.stdout_hist += self.ps1
             else:
@@ -1079,7 +1082,8 @@ def prompt(self, more):
                 self.stdout_hist += self.ps2
             else:
                 self.stdout_hist += self.ps2.encode(getpreferredencoding())
-            self.s_hist.append('\x01%s\x03%s\x04' % (prompt_more_color, self.ps2))
+            self.s_hist.append('\x01%s\x03%s\x04' %
+                               (prompt_more_color, self.ps2))
 
     def push(self, s, insert_into_history=True):
         # curses.raw(True) prevents C-c from causing a SIGINT
@@ -1103,7 +1107,7 @@ def redraw(self):
             self.iy, self.ix = self.scr.getyx()
             for i in s.split('\x04'):
                 self.echo(i, redraw=False)
-            if k < len(self.s_hist) -1:
+            if k < len(self.s_hist) - 1:
                 self.scr.addstr('\n')
         self.iy, self.ix = self.scr.getyx()
         self.print_line(self.s)
@@ -1186,14 +1190,12 @@ def resize(self):
         self.statusbar.resize(refresh=False)
         self.redraw()
 
-
     def getstdout(self):
         """This method returns the 'spoofed' stdout buffer, for writing to a
         file or sending to a pastebin or whatever."""
 
         return self.stdout_hist + '\n'
 
-
     def reevaluate(self):
         """Clear the buffer, redraw the screen and re-evaluate the history"""
 
@@ -1234,7 +1236,7 @@ def reevaluate(self):
 
         self.evaluating = False
         #map(self.push, self.history)
-        #^-- That's how simple this method was at first :(
+        # ^-- That's how simple this method was at first :(
 
     def write(self, s):
         """For overriding stdout defaults"""
@@ -1258,7 +1260,6 @@ def write(self, s):
         self.echo(s)
         self.s_hist.append(s.rstrip())
 
-
     def show_list(self, items, arg_pos, topline=None, formatter=None, current_item=None):
 
         shared = Struct()
@@ -1345,7 +1346,7 @@ def lsize():
             self.list_win.resize(rows + 2, w)
         else:
             docstring = self.format_docstring(self.docstring, max_w - 2,
-                max_h - height_offset)
+                                              max_h - height_offset)
             docstring_string = ''.join(docstring)
             rows += len(docstring)
             self.list_win.resize(rows, max_w)
@@ -1445,7 +1446,7 @@ def tab(self, back=False):
 
         # 3. check to see if we can expand the current word
         if self.matches_iter.is_cseq():
-            #TODO resolve this error-prone situation:
+            # TODO resolve this error-prone situation:
             # can't assign at same time to self.s and self.cursor_offset
             # because for cursor_offset
             # property to work correctly, self.s must already be set
@@ -1458,7 +1459,7 @@ def tab(self, back=False):
         # 4. swap current word for a match list item
         elif self.matches_iter.matches:
             current_match = back and self.matches_iter.previous() \
-                                  or next(self.matches_iter)
+                or next(self.matches_iter)
             try:
                 self.show_list(self.matches_iter.matches, self.arg_pos,
                                topline=self.funcprops,
@@ -1500,7 +1501,7 @@ def send_current_line_to_editor(self):
             return ''
 
         self.f_string = ''
-        self.cpos = -1 # Set cursor position to -1 to prevent paren matching
+        self.cpos = -1  # Set cursor position to -1 to prevent paren matching
 
         self.iy, self.ix = self.scr.getyx()
         self.evaluating = True
@@ -1531,6 +1532,7 @@ def send_current_line_to_editor(self):
         self.scr.redrawwin()
         return ''
 
+
 class Statusbar(object):
     """This class provides the status bar at the bottom of the screen.
     It has message() and prompt() methods for user interactivity, as
@@ -1687,7 +1689,7 @@ def clear(self):
 def init_wins(scr, config):
     """Initialise the two windows (the main repl interface and the little
     status bar at the bottom with some stuff in it)"""
-    #TODO: Document better what stuff is on the status bar.
+    # TODO: Document better what stuff is on the status bar.
 
     background = get_colpair(config, 'background')
     h, w = gethw()
@@ -1719,11 +1721,13 @@ def sigwinch(unused_scr):
     global DO_RESIZE
     DO_RESIZE = True
 
+
 def sigcont(unused_scr):
     sigwinch(unused_scr)
     # Forces the redraw
     curses.ungetch('\x00')
 
+
 def gethw():
     """I found this code on a usenet post, and snipped out the bit I needed,
     so thanks to whoever wrote that, sorry I forgot your name, I'm sure you're
@@ -1761,7 +1765,8 @@ def gethw():
             sizex = right - left + 1
             sizey = bottom - top + 1
         else:
-            sizex, sizey = stdscr.getmaxyx()# can't determine actual size - return default values
+            # can't determine actual size - return default values
+            sizex, sizey = stdscr.getmaxyx()
 
         h, w = sizey, sizex
     return h, w
@@ -1796,7 +1801,7 @@ def do_resize(caller):
     global DO_RESIZE
     h, w = gethw()
     if not h:
-    # Hopefully this shouldn't happen. :)
+        # Hopefully this shouldn't happen. :)
         return
 
     curses.endwin()
@@ -1878,7 +1883,8 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
         old_sigwinch_handler = signal.signal(signal.SIGWINCH,
                                              lambda *_: sigwinch(scr))
         # redraw window after being suspended
-        old_sigcont_handler = signal.signal(signal.SIGCONT, lambda *_: sigcont(scr))
+        old_sigcont_handler = signal.signal(
+            signal.SIGCONT, lambda *_: sigcont(scr))
 
     stdscr = scr
     try:
@@ -1951,7 +1957,6 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
 def main(args=None, locals_=None, banner=None):
     translations.init()
 
-
     config, options, exec_args = argsparse(args)
 
     # Save stdin, stdout and stderr for later restoration
@@ -1975,6 +1980,7 @@ def main(args=None, locals_=None, banner=None):
         sys.stdout.flush()
     return repl.extract_exit_value(exit_value)
 
+
 if __name__ == '__main__':
     sys.exit(main())
 
diff --git a/bpython/config.py b/bpython/config.py
@@ -183,7 +183,8 @@ def get_key_no_doublebind(command):
     struct.hist_length = config.getint('general', 'hist_length')
     struct.hist_duplicates = config.getboolean('general', 'hist_duplicates')
     struct.flush_output = config.getboolean('general', 'flush_output')
-    struct.default_autoreload = config.getboolean('general', 'default_autoreload')
+    struct.default_autoreload = config.getboolean(
+        'general', 'default_autoreload')
 
     struct.pastebin_key = get_key_no_doublebind('pastebin')
     struct.copy_clipboard_key = get_key_no_doublebind('copy_clipboard')
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -139,7 +139,7 @@ def main(args=None, locals_=None, banner=None, welcome_message=None):
                    help=_("log debug messages to bpython.log")),
             Option('--paste', '-p', action='store_true',
                    help=_("start by pasting lines of a file into session")),
-            ]))
+        ]))
     if options.log is None:
         options.log = 0
     logging_levels = [logging.ERROR, logging.INFO, logging.DEBUG]
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -205,4 +205,5 @@ def reload():
     for _ in find_all_modules():
         pass
 
+
 find_iterator = find_all_modules()
diff --git a/bpython/line.py b/bpython/line.py
@@ -15,8 +15,8 @@
 LinePart = namedtuple('LinePart', ['start', 'stop', 'word'])
 
 current_word_re = LazyReCompile(
-        r'(?<![)\]\w_.])'
-        r'([\w_][\w0-9._]*[(]?)')
+    r'(?<![)\]\w_.])'
+    r'([\w_][\w0-9._]*[(]?)')
 
 
 def current_word(cursor_offset, line):
@@ -222,7 +222,7 @@ def current_dotted_attribute(cursor_offset, line):
 
 
 current_expression_attribute_re = LazyReCompile(
-        r'[.]\s*((?:[\w_][\w0-9_]*)|(?:))')
+    r'[.]\s*((?:[\w_][\w0-9_]*)|(?:))')
 
 
 def current_expression_attribute(cursor_offset, line):
diff --git a/bpython/patch_linecache.py b/bpython/patch_linecache.py
@@ -34,7 +34,7 @@ def remember_bpython_input(self, source):
         a fake filename to use to retrieve it later."""
         filename = '<bpython-input-%s>' % len(self.bpython_history)
         self.bpython_history.append((len(source), None,
-                                    source.splitlines(True), filename))
+                                     source.splitlines(True), filename))
         return filename
 
     def __getitem__(self, key):
diff --git a/bpython/repl.py b/bpython/repl.py
diff --git a/bpython/simpleeval.py b/bpython/simpleeval.py
diff --git a/bpython/urwid.py b/bpython/urwid.py
