Modified repl.py to conform to follow more PEP standards including 8 and 263

shanahanjrs · sebastinas · commit 4c08efefea81 · 2017-01-22T11:13:24.000+01:00
[Sebastian Ramacher]: Squashed 204bc17 and 9a0aeda and rebased on current master.
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -59,6 +59,7 @@
 
 
 class RuntimeTimer(object):
+    """Calculate running time"""
     def __init__(self):
         self.reset_timer()
         self.time = time.monotonic if hasattr(time, 'monotonic') else time.time
@@ -224,7 +225,7 @@ def showtraceback(self):
                     tblist[i] = (fname, lineno, module, something)
                 # Set the right lineno (encoding header adds an extra line)
                 if fname == '<input>' and not py3:
-                        tblist[i] = (fname, lineno - 2, module, something)
+                    tblist[i] = (fname, lineno - 2, module, something)
 
             l = traceback.format_list(tblist)
             if l:
@@ -787,13 +788,13 @@ def line_is_empty(line):
             indentation = 0
         return indentation
 
-    def formatforfile(self, s):
+    def formatforfile(self, session_ouput):
         """Format the stdout buffer to something suitable for writing to disk,
         i.e. without >>> and ... at input lines and with "# OUT: " prepended to
         output lines."""
 
         def process():
-            for line in s.split('\n'):
+            for line in session_ouput.split('\n'):
                 if line.startswith(self.ps1):
                     yield line[len(self.ps1):]
                 elif line.startswith(self.ps2):
@@ -834,11 +835,11 @@ def write2file(self):
                 self.interact.notify(_('Save cancelled.'))
                 return
 
-        s = self.formatforfile(self.getstdout())
+        session_test = self.formatforfile(self.getstdout())
 
         try:
             with open(fn, mode) as f:
-                f.write(s)
+                f.write(stdout_text)
         except IOError as e:
             self.interact.notify(_("Error writing file '%s': %s") % (fn, e))
         else:
@@ -876,8 +877,8 @@ def do_pastebin(self, s):
         if s == self.prev_pastebin_content:
             self.interact.notify(_('Duplicate pastebin. Previous URL: %s. '
                                    'Removal URL: %s') %
-                                  (self.prev_pastebin_url,
-                                   self.prev_removal_url), 10)
+                                 (self.prev_pastebin_url,
+                                  self.prev_removal_url), 10)
             return self.prev_pastebin_url
 
         self.interact.notify(_('Posting data to pastebin...'))
@@ -1088,7 +1089,7 @@ def clear_current_line(self):
         """This is used as the exception callback for the Interpreter instance.
         It prevents autoindentation from occurring after a traceback."""
 
-    def send_to_external_editor(self, text, filename=None):
+    def send_to_external_editor(self, text):
         """Returns modified text from an editor, or the original text if editor
         exited with non-zero"""
 
@@ -1117,15 +1118,14 @@ def open_in_external_editor(self, filename):
         return subprocess.call(args) == 0
 
     def edit_config(self):
-        if not (os.path.isfile(self.config.config_path)):
+        if not os.path.isfile(self.config.config_path):
             if self.interact.confirm(_("Config file does not exist - create "
                                        "new from default? (y/N)")):
                 try:
                     default_config = pkgutil.get_data('bpython',
                                                       'sample-config')
                     if py3:  # py3 files need unicode
                         default_config = default_config.decode('ascii')
-                    bpython_dir, script_name = os.path.split(__file__)
                     containing_dir = os.path.dirname(
                         os.path.abspath(self.config.config_path))
                     if not os.path.exists(containing_dir):
@@ -1159,10 +1159,10 @@ def next_indentation(line, tab_length):
     return indentation
 
 
-def next_token_inside_string(s, inside_string):
+def next_token_inside_string(code_string, inside_string):
     """Given a code string s and an initial state inside_string, return
     whether the next token will be inside a string or not."""
-    for token, value in PythonLexer().get_tokens(s):
+    for token, value in PythonLexer().get_tokens(code_string):
         if token is Token.String:
             value = value.lstrip('bBrRuU')
             if value in ['"""', "'''", '"', "'"]:
