merge code cleanup branch

Author: RonnyPfannschmidt

pyrepl/copy_code.py

@@ -143,11 +143,11 @@ def make_default_syntax_table():
      (r'\M-8', 'digit-arg'),
      (r'\M-9', 'digit-arg'),
      #(r'\M-\n', 'insert-nl'),
-     ('\\\\', 'self-insert')] + \
+     ('\\\\', 'self-insert')] +
     [(c, 'self-insert')
-     for c in map(chr, range(32, 127)) if c != '\\'] + \
+     for c in map(chr, range(32, 127)) if c != '\\'] +
     [(c, 'self-insert')
-     for c in map(chr, range(128, 256)) if c.isalpha()] + \
+     for c in map(chr, range(128, 256)) if c.isalpha()] +
     [(r'\<up>', 'up'),
      (r'\<down>', 'down'),
      (r'\<left>', 'left'),
@@ -244,9 +244,9 @@ def __init__(self, console):
         self.commands = {}
         self.msg = ''
         for v in vars(commands).values():
-            if (isinstance(v, type)
-                and issubclass(v, commands.Command)
-                and v.__name__[0].islower()):
+            if (isinstance(v, type) and
+                    issubclass(v, commands.Command) and
+                    v.__name__[0].islower()):
                 self.commands[v.__name__] = v
                 self.commands[v.__name__.replace('_', '-')] = v
         self.syntax_table = make_default_syntax_table()

pyrepl/reader.py

@@ -26,7 +26,8 @@
 extensions for multiline input.
 """
 
-import sys, os
+import sys
+import os
 from pyrepl import commands
 from pyrepl.historical_reader import HistoricalReader
 from pyrepl.completing_reader import CompletingReader
@@ -35,41 +36,43 @@
 
 ENCODING = sys.getfilesystemencoding() or 'latin1'     # XXX review
 
-__all__ = ['add_history',
-           'clear_history',
-           'get_begidx',
-           'get_completer',
-           'get_completer_delims',
-           'get_current_history_length',
-           'get_endidx',
-           'get_history_item',
-           'get_history_length',
-           'get_line_buffer',
-           'insert_text',
-           'parse_and_bind',
-           'read_history_file',
-           'read_init_file',
-           'redisplay',
-           'remove_history_item',
-           'replace_history_item',
-           'set_completer',
-           'set_completer_delims',
-           'set_history_length',
-           'set_pre_input_hook',
-           'set_startup_hook',
-           'write_history_file',
-           # ---- multiline extensions ----
-           'multiline_input',
-           ]
+__all__ = [
+    'add_history',
+    'clear_history',
+    'get_begidx',
+    'get_completer',
+    'get_completer_delims',
+    'get_current_history_length',
+    'get_endidx',
+    'get_history_item',
+    'get_history_length',
+    'get_line_buffer',
+    'insert_text',
+    'parse_and_bind',
+    'read_history_file',
+    'read_init_file',
+    'redisplay',
+    'remove_history_item',
+    'replace_history_item',
+    'set_completer',
+    'set_completer_delims',
+    'set_history_length',
+    'set_pre_input_hook',
+    'set_startup_hook',
+    'write_history_file',
+    # ---- multiline extensions ----
+    'multiline_input',
+]
 
 # ____________________________________________________________
 
+
 class ReadlineConfig(object):
     readline_completer = None
     completer_delims = dict.fromkeys(' \t\n`~!@#$%^&*()-=+[{]}\\|;:\'",<>/?')
 
-class ReadlineAlikeReader(HistoricalReader, CompletingReader):
 
+class ReadlineAlikeReader(HistoricalReader, CompletingReader):
     assume_immutable_completions = False
     use_brackets = False
     sort_in_column = True
@@ -156,10 +159,11 @@ def after_command(self, cmd):
                 if self.pos > len(self.buffer):
                     self.pos = len(self.buffer)
 
+
 class maybe_accept(commands.Command):
     def do(self):
         r = self.reader
-        r.dirty = 1 # this is needed to hide the completion menu, if visible
+        r.dirty = 1  # this is needed to hide the completion menu, if visible
         #
         # if there are already several lines and the cursor
         # is not on the last one, always insert a new \n.
@@ -171,7 +175,6 @@ def do(self):
         else:
             self.finish = 1
 
-# ____________________________________________________________
 
 class _ReadlineWrapper(object):
     reader = None
@@ -369,6 +372,7 @@ def insert_text(self, text):
 # ____________________________________________________________
 # Stubs
 
+
 def _make_stub(_name, _ret):
     def stub(*args, **kwds):
         import warnings
@@ -380,16 +384,16 @@ def stub(*args, **kwds):
     ('read_init_file', None),
     ('redisplay', None),
     ('set_pre_input_hook', None),
-    ]:
+]:
     assert _name not in globals(), _name
     _make_stub(_name, _ret)
 
-# ____________________________________________________________
 
 def _setup():
     global _old_raw_input
     if _old_raw_input is not None:
-        return # don't run _setup twice
+        return
+    # don't run _setup twice
 
     try:
         f_in = sys.stdin.fileno()

pyrepl/readline.py

@@ -26,13 +26,15 @@
 import sys
 from pyrepl.readline import multiline_input, _error, _get_reader
 
+
 def check():     # returns False if there is a problem initializing the state
     try:
         _get_reader()
     except _error:
         return False
     return True
 
+
 def run_multiline_interactive_console(mainmodule=None):
     import code
     import __main__