Python flake8 crap

rocky · rocky · commit e6761e13bb0a · 2016-12-18T20:18:19.000-05:00
Was testing realgud's C-x!8 (goto flake8 warning/error)
diff --git a/uncompyle6/bin/pydisassemble.py b/uncompyle6/bin/pydisassemble.py
@@ -62,7 +62,6 @@ def main():
             print(Usage_short, file=sys.stderr)
             sys.exit(1)
 
-
     for file in files:
         if os.path.exists(files[0]):
             disassemble_file(file, sys.stdout, native)
diff --git a/uncompyle6/bin/uncompile.py b/uncompyle6/bin/uncompile.py
@@ -224,7 +224,6 @@ def process_func():
         except (KeyboardInterrupt, OSError):
             pass
 
-
     if timestamp:
         print(time.strftime(timestampfmt))
 
diff --git a/uncompyle6/parsers/parse2.py b/uncompyle6/parsers/parse2.py
@@ -272,7 +272,7 @@ def add_custom_rules(self, tokens, customize):
                 continue
             elif opname_base in ('BUILD_LIST', 'BUILD_TUPLE', 'BUILD_SET'):
                 thousands = (v//1024)
-                thirty32s = ((v//32)%32)
+                thirty32s = ((v//32) % 32)
                 if thirty32s > 0:
                     rule = "expr32 ::=%s" % (' expr' * 32)
                     self.add_unique_rule(rule, opname_base, v, customize)
diff --git a/uncompyle6/parsers/parse25.py b/uncompyle6/parsers/parse25.py
@@ -40,7 +40,6 @@ def add_custom_rules(self, tokens, customize):
         if self.version == 2.5:
             self.check_reduce['tryelsestmt'] = 'tokens'
 
-
     def reduce_is_invalid(self, rule, ast, tokens, first, last):
         super(Python25Parser, self).reduce_is_invalid(rule, ast, tokens, first, last)
 
diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py
@@ -115,8 +115,10 @@ class Python27ParserSingle(Python27Parser, PythonParserSingle):
             """.split()))
         remain_tokens = set(tokens) - opcode_set
         import re
-        remain_tokens = set([re.sub('_\d+$','', t) for t in remain_tokens])
-        remain_tokens = set([re.sub('_CONT$','', t) for t in remain_tokens])
+        remain_tokens = set([re.sub('_\d+$', '', t)
+                             for t in remain_tokens])
+        remain_tokens = set([re.sub('_CONT$', '', t)
+                             for t in remain_tokens])
         remain_tokens = set(remain_tokens) - opcode_set
         print(remain_tokens)
         # p.dumpGrammar()
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
@@ -550,7 +550,7 @@ def add_custom_rules(self, tokens, customize):
             elif opname_base in ('BUILD_LIST', 'BUILD_TUPLE', 'BUILD_SET'):
                 v = token.attr
                 rule = ('build_list ::= ' + 'expr1024 ' * int(v//1024) +
-                                        'expr32 ' * int((v//32)%32) + 'expr '*(v%32) + opname)
+                                        'expr32 ' * int((v//32)%32) + 'expr '*(v % 32) + opname)
                 self.add_unique_rule(rule, opname, token.attr, customize)
                 if opname_base == 'BUILD_TUPLE':
                     rule = ('load_closure ::= %s%s' % (('LOAD_CLOSURE ' * v), opname))
diff --git a/uncompyle6/scanners/scanner2.py b/uncompyle6/scanners/scanner2.py
@@ -37,7 +37,7 @@ def __init__(self, version, show_asm=None, is_pypy=False):
         self.jump_forward = frozenset([self.opc.JUMP_ABSOLUTE, self.opc.JUMP_FORWARD])
         # This is the 2.5+ default
         # For <2.5 it is <generator expression>
-        self.genexpr_name = '<genexpr>';
+        self.genexpr_name = '<genexpr>'
 
     @staticmethod
     def unmangle_name(name, classname):
@@ -68,7 +68,6 @@ def unmangle_code_names(self, co, classname):
             varnames = co.co_varnames
         return free, names, varnames
 
-
     def ingest(self, co, classname=None, code_objects={}, show_asm=None):
         """
         Pick out tokens from an uncompyle6 code object, and transform them,
diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py
@@ -159,7 +159,7 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None):
 
         customize = {}
         if self.is_pypy:
-            customize['PyPy'] = 1;
+            customize['PyPy'] = 1
 
         self.code = array('B', co.co_code)
         self.build_lines_data(co)
@@ -699,9 +699,9 @@ def detect_structure(self, offset, targets):
                 # everything inside inner 'or' jumps and midline ifs
                 match = self.rem_or(start, self.next_stmt[offset],
                                     self.opc.POP_JUMP_IF_FALSE, target)
-                ## We can't remove mid-line ifs because line structures have changed
-                ## from restructBytecode().
-                ##  match = self.remove_mid_line_ifs(match)
+                # We can't remove mid-line ifs because line structures have changed
+                # from restructBytecode().
+                #  match = self.remove_mid_line_ifs(match)
 
                 # If we still have any offsets in set, start working on it
                 if match:
