PEP-8 conformance

ikanobori · ikanobori · commit 2c906bfc372c · 2009-10-27T15:03:20.000+01:00
diff --git a/bpython/_internal.py b/bpython/_internal.py
@@ -8,6 +8,7 @@
 
 
 class _Helper(object):
+
     def __init__(self):
         self.helper = pydoc.Helper(sys.stdin, sys.stdout)
 
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -412,11 +412,11 @@ def cw(self):
             return
 
         i = 1
-        while i < l+1:
+        while i < l + 1:
             if not self.s[-i].isalnum() and self.s[-i] not in ('.', '_'):
                 break
             i += 1
-        return self.s[-i +1:]
+        return self.s[-i + 1:]
 
     def delete(self):
         """Process a del"""
@@ -597,17 +597,17 @@ def mkargspec(self, topline, down):
             y, x = self.list_win.getyx()
             ln = len(str(i))
             kw = None
-            if kwargs and k+1 > len(args) - len(kwargs):
+            if kwargs and k + 1 > len(args) - len(kwargs):
                 kw = str(kwargs[k - (len(args) - len(kwargs))])
                 ln += len(kw) + 1
 
             if ln + x >= w:
                 ty = self.list_win.getbegyx()[0]
                 if not down and ty > 0:
-                    h +=1
+                    h += 1
                     self.list_win.mvwin(ty-1, 1)
                     self.list_win.resize(h, w)
-                elif down and h + r < maxh-ty:
+                elif down and h + r < maxh - ty:
                     h += 1
                     self.list_win.resize(h, w)
                 else:
@@ -985,7 +985,7 @@ def show_list(self, items, topline=None, current_item=None):
         if down:
             max_h = h - y
         else:
-            max_h = y+1
+            max_h = y + 1
         max_w = int(w * 0.8)
         self.list_win.erase()
         if items:
@@ -1057,7 +1057,7 @@ def lsize():
             w = t
 
 
-        if height_offset and display_rows+5 >= max_h:
+        if height_offset and display_rows + 5 >= max_h:
             del v_items[-(cols * (height_offset)):]
 
         if self.docstring is None:
@@ -1087,7 +1087,7 @@ def lsize():
             if not py3:
                 i = i.encode(getpreferredencoding())
             self.list_win.addstr(i + padding, color)
-            if ((cols == 1 or (ix and not (ix+1) % cols))
+            if ((cols == 1 or (ix and not (ix + 1) % cols))
                     and ix + 1 < len(v_items)):
                 self.list_win.addstr('\n ')
 
@@ -1392,7 +1392,8 @@ def gethw():
 
     """
     h, w = struct.unpack(
-        "hhhh", fcntl.ioctl(sys.__stdout__, termios.TIOCGWINSZ, "\000"*8))[0:2]
+        "hhhh",
+        fcntl.ioctl(sys.__stdout__, termios.TIOCGWINSZ, "\000" * 8))[0:2]
     return h, w
 
 
diff --git a/bpython/config.py b/bpython/config.py
@@ -5,10 +5,12 @@
 from bpython.keys import key_dispatch
 import errno
 
+
 class Struct(object):
     """Simple class for instantiating objects we can add arbitrary attributes
     to and use for various arbitrary things."""
 
+
 def fill_config_with_default_values(config, default_values):
     for section in default_values.iterkeys():
         if not config.has_section(section):
@@ -42,8 +44,7 @@ def loadini(struct, configfile):
             'paste_time': 0.02,
             'syntax': True,
             'tab_length': 4,
-            'pastebin_url': 'http://bpaste.net'
-        },
+            'pastebin_url': 'http://bpaste.net'},
         'keyboard': {
             'clear_line': 'C-u',
             'clear_screen': 'C-l',
@@ -57,9 +58,7 @@ def loadini(struct, configfile):
             'show_source': 'F2',
             'undo': 'C-r',
             'up_one_line': 'C-p',
-            'yank_from_buffer': 'C-y'
-        }
-    })
+            'yank_from_buffer': 'C-y'}})
     config.read(config_path)
 
     struct.tab_length = config.getint('general', 'tab_length')
@@ -118,6 +117,7 @@ def loadini(struct, configfile):
     for key in (struct.pastebin_key, struct.save_key):
         key_dispatch[key]
 
+
 def load_theme(struct, path, inipath):
     theme = ConfigParser()
     try:
@@ -137,7 +137,8 @@ def load_theme(struct, path, inipath):
 
 
 def migrate_rc(path):
-    """Use the shlex module to convert the old configuration file to the new format.
+    """Use the shlex module to convert the old configuration file to the new
+    format.
     The old configuration file is renamed but not removed by now."""
     import shlex
     f = open(path)
@@ -149,8 +150,7 @@ def migrate_rc(path):
         'on': True,
         'false': False,
         'no': False,
-        'off': False
-    }
+        'off': False}
 
     config = ConfigParser()
     config.add_section('general')
diff --git a/bpython/formatter.py b/bpython/formatter.py
@@ -68,8 +68,7 @@
     Token: 'token',
     Whitespace: 'background',
     Parenthesis: 'paren',
-    Parenthesis.UnderCursor: 'operator'
-}
+    Parenthesis.UnderCursor: 'operator'}
 
 
 class BPythonFormatter(Formatter):
@@ -104,7 +103,7 @@ def format(self, tokensource, outfile):
 
             while token not in self.f_strings:
                 token = token.parent
-            o +=  "%s\x03%s\x04" % (self.f_strings[token], text)
+            o += "%s\x03%s\x04" % (self.f_strings[token], text)
         outfile.write(o.rstrip())
 
 # vim: sw=4 ts=4 sts=4 ai et
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -53,6 +53,7 @@ class ArgspecFormatter(object):
     """
     Format an argspec using Pango markup language.
     """
+
     def format(self, args, varargs, varkw, defaults, in_arg):
         self.args_seen = 0
         self.in_arg = in_arg
@@ -76,6 +77,7 @@ class Nested(object):
     """
     A helper class, inspired by a semaphore.
     """
+
     def __init__(self):
         self.counter = 0
 
@@ -97,6 +99,7 @@ class SuggestionWindow(gtk.Window):
     __gsignals__ = dict(expose_event=None,
                         selection_changed=(gobject.SIGNAL_RUN_LAST, None,
                                            (str, )))
+
     def __init__(self):
         gtk.Window.__init__(self, gtk.WINDOW_POPUP)
         self.set_app_paintable(True)
@@ -213,6 +216,7 @@ class ReplWidget(gtk.TextView, repl.Repl):
                         focus_in_event=None,
                         focus_out_event=None,
                         realize=None)
+
     def __init__(self, interpreter):
         gtk.TextView.__init__(self)
         repl.Repl.__init__(self, interpreter)
@@ -569,14 +573,17 @@ def init_import_completion():
 def on_about(widget):
     pass
 
+
 def on_quit(widget):
     pass
 
+
 def on_button_press_event(widget, event, popup):
     if event.button == 3:
         popup.popup(None, None, None, event.button, event.time)
         return True
 
+
 def main(args=None):
     if args is None:
         args = sys.argv[1:]
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -30,6 +30,7 @@
 modules = set()
 fully_loaded = False
 
+
 def complete(line, cw):
     """Construct a full list of possibly completions for imports."""
     if not cw:
@@ -102,6 +103,7 @@ def find_all_modules(path=None):
             modules.add(module)
             yield
 
+
 def find_coroutine():
     global fully_loaded
 
@@ -115,6 +117,7 @@ def find_coroutine():
 
     return True
 
+
 def reload():
     """Refresh the list of known modules."""
     modules.clear()
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -41,6 +41,7 @@
 class AttrCleaner(object):
     """A context manager that tries to make an object not exhibit side-effects
        on attribute lookup."""
+
     def __init__(self, obj):
         self.obj = obj
 
@@ -128,6 +129,7 @@ def parsekeywordpairs(signature):
             d[item[0]] = ''.join(item[2:])
     return d
 
+
 def fixlongargs(f, argspec):
     """Functions taking default arguments that are references to other objects
     whose str() is too big will cause breakage, so we swap out the object
diff --git a/bpython/keys.py b/bpython/keys.py
@@ -25,15 +25,18 @@
 
 import string
 
+
 class KeyMap:
+
     def __init__(self):
         self.map = {}
 
     def __getitem__(self, key):
         if key in self.map:
             return self.map[key]
         else:
-            raise Exception('Configured keymap (%s) does not exist in bpython.keys' % key)
+            raise Exception('Configured keymap (%s)\
+does not exist in bpython.keys' % key)
 
     def __setitem__(self, key, value):
         self.map[key] = value
@@ -42,7 +45,7 @@ def __setitem__(self, key, value):
 
 # fill dispatch with letters
 for c in string.ascii_lowercase:
-    key_dispatch['C-%s' % c] = (chr(string.ascii_lowercase.index(c)+1),
+    key_dispatch['C-%s' % c] = (chr(string.ascii_lowercase.index(c) + 1),
                                 '^%s' % c.upper())
 
 # fill dispatch with cool characters
@@ -53,5 +56,5 @@ def __setitem__(self, key, value):
 key_dispatch['C-_'] = (chr(31), '^_')
 
 # fill dispatch with function keys
-for x in xrange(1,13):
+for x in xrange(1, 13):
     key_dispatch['F%s' % str(x)] = ('KEY_F(%s)' % str(x),)
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -64,6 +64,7 @@ def __init__(self, locals=None, encoding=sys.getdefaultencoding()):
         code.InteractiveInterpreter.__init__(self, locals)
 
     if not py3:
+
         def runsource(self, source, filename='<input>', symbol='single'):
             source = '# coding: %s\n%s' % (self.encoding,
                                            source.encode(self.encoding))
@@ -130,6 +131,7 @@ def writetb(self, lines):
 
 
 class History(object):
+
     def __init__(self, entries=None):
         if entries is None:
             self.entries = ['']
@@ -189,6 +191,7 @@ def save(self, filename, encoding, lines=0):
 
 
 class MatchesIterator(object):
+
     def __init__(self, current_word='', matches=[]):
         self.current_word = current_word
         self.matches = list(matches)
@@ -298,7 +301,6 @@ def __init__(self, interp, idle=None):
             with open(filename, 'r') as f:
                 self.interp.runsource(f.read(), filename, 'exec')
 
-
     def attr_matches(self, text):
         """Taken from rlcompleter.py and bent to my will."""
 
@@ -586,7 +588,7 @@ def write2file(self):
     def pastebin(self):
         """Upload to a pastebin and display the URL in the status bar."""
 
-        pasteservice_url = OPTS.pastebin_url 
+        pasteservice_url = OPTS.pastebin_url
         pasteservice = ServerProxy(urljoin(pasteservice_url, '/xmlrpc/'))
 
         s = self.getstdout()
@@ -595,7 +597,7 @@ def pastebin(self):
         try:
             paste_id = pasteservice.pastes.newPaste('pycon', s)
         except XMLRPCError, e:
-            self.statusbar.message( 'Upload failed: %s' % (str(e), ) )
+            self.statusbar.message('Upload failed: %s' % (str(e), ) )
             return
 
         paste_url = urljoin(pasteservice_url, '/show/%s/' % (paste_id, ))
@@ -849,9 +851,11 @@ def split_lines(tokens):
             if newline:
                 yield (Token.Text, newline)
 
+
 def token_is(token_type):
     """Return a callable object that returns whether a token is of the
     given type `token_type`."""
+
     def token_is_type(token):
         """Return whether a token is of a certain type or not."""
         token = token[0]
@@ -861,6 +865,7 @@ def token_is_type(token):
 
     return token_is_type
 
+
 def token_is_any_of(token_types):
     """Return a callable object that returns whether a token is any of the
     given types `token_types`."""
