Merge pull request #391 from ivuk/pep8-fixes

PEP 8 fixes

Author: JukkaL

mypy/build.py

@@ -44,10 +44,10 @@
 
 
 # Build flags
-COMPILE_ONLY = 'compile-only'   # Compile only to C, do not generate binary
-VERBOSE = 'verbose'             # More verbose messages (for troubleshooting)
-MODULE = 'module'               # Build/run module as a script
-TEST_BUILTINS = 'test-builtins' # Use stub builtins to speed up tests
+COMPILE_ONLY = 'compile-only'    # Compile only to C, do not generate binary
+VERBOSE = 'verbose'              # More verbose messages (for troubleshooting)
+MODULE = 'module'                # Build/run module as a script
+TEST_BUILTINS = 'test-builtins'  # Use stub builtins to speed up tests
 
 
 # State ids. These describe the states a source file / module can be in a
@@ -325,7 +325,7 @@ def __init__(self, data_dir: str,
         self.states = List[State]()
         self.module_files = Dict[str, str]()
         self.icode = Dict[str, FuncIcode]()
-        self.binary_path = None # type: str
+        self.binary_path = None  # type: str
         self.module_deps = Dict[Tuple[str, str], bool]()
         self.missing_modules = Set[str]()
 
@@ -505,7 +505,7 @@ def final_passes(self, files: List[MypyFile],
             self.generate_icode(files, types)
             self.generate_c_and_compile(files)
         elif self.target in [SEMANTIC_ANALYSIS, TYPE_CHECK]:
-            pass # Nothing to do.
+            pass  # Nothing to do.
         else:
             raise RuntimeError('Unsupported target %d' % self.target)
 
@@ -563,10 +563,10 @@ def generate_c_and_compile(self, files: List[MypyFile]) -> None:
             vm_dir = os.path.join(data_dir, 'vm')
             cc = os.getenv('CC', 'gcc')
             cflags = shlex.split(os.getenv('CFLAGS', '-O2'))
-            cmdline = [cc] + cflags +['-I%s' % vm_dir,
-                                      '-o%s' % program_name,
-                                      c_file,
-                                      os.path.join(vm_dir, 'runtime.c')]
+            cmdline = [cc] + cflags + ['-I%s' % vm_dir,
+                                       '-o%s' % program_name,
+                                       c_file,
+                                       os.path.join(vm_dir, 'runtime.c')]
             self.log(' '.join(cmdline))
             status = subprocess.call(cmdline)
             # TODO check status
@@ -675,7 +675,7 @@ def is_ready(self) -> bool:
 
     def num_incomplete_deps(self) -> int:
         """Return the number of dependencies that are ready but incomplete."""
-        return 0 # Does not matter in this state
+        return 0  # Does not matter in this state
 
     def state(self) -> int:
         raise RuntimeError('Not implemented')
@@ -964,7 +964,7 @@ def verify_module(id: str, path: str) -> bool:
 def super_packages(id: str) -> List[str]:
     """Return the surrounding packages of a module, e.g. ['os'] for os.path."""
     c = id.split('.')
-    res = [] # type: List[str]
+    res = []  # type: List[str]
     for i in range(1, len(c)):
         res.append('.'.join(c[:i]))
     return res

mypy/cgen.py

@@ -38,17 +38,17 @@
 
 class CGenerator:
     """Translate icode to C."""
-    
+
     func = Undefined(FuncIcode)
 
     def __init__(self) -> None:
         self.prolog = ['#include "mypy.h"\n']
-        self.types = [] # type: List[str]
-        self.out = [] # type: List[str]
+        self.types = []  # type: List[str]
+        self.out = []  # type: List[str]
         self.indent = 0
         self.frame_size = 0
-        self.global_vars = {} # type: Dict[str, int]
-        self.classes = {} # type: Dict[TypeInfo, ClassRepresentation]
+        self.global_vars = {}  # type: Dict[str, int]
+        self.classes = {}  # type: Dict[TypeInfo, ClassRepresentation]
         # Count temp labels.
         self.num_labels = 0
 
@@ -60,7 +60,7 @@ def output(self) -> List[str]:
         result.extend(self.out)
         result.append(MAIN_FRAGMENT)
         return result
-    
+
     def generate_function(self, name: str, func: FuncIcode) -> None:
         # Initialize function-specific state information.
         self.func = func
@@ -70,7 +70,7 @@ def generate_function(self, name: str, func: FuncIcode) -> None:
         # Simplistic name mangling.
         name = name.replace('.', '_')
         name = name.replace('$', '_')
-        
+
         # Add function definition and opening brace.
         header = 'MValue %s(MEnv *e)' % name
         self.emit(header)
@@ -84,9 +84,9 @@ def generate_function(self, name: str, func: FuncIcode) -> None:
         self.emit('MValue *frame = e->frame;')
         self.emit('e->frame = frame + %d;' % self.frame_size)
         self.emit('if (e->frame >= e->stack_top)')
-        self.emit('    abort();') # Dummy handler; should raise an exception
+        self.emit('    abort();')  # Dummy handler; should raise an exception
 
-        # Geneate code that initializes the stack frame. The gc must not see
+        # Generate code that initializes the stack frame. The gc must not see
         # uninitialized values.
         for i in range(func.num_args, self.frame_size):
             if func.register_types[i] == icode.INT:
@@ -183,12 +183,12 @@ def opcode(self, opcode: BinOp) -> None:
             # Overflow check needs third argument (operation result).
             label = self.label()
             self.emit('if (MIsShort(%s) && MIsShort(%s)) {' % (left, right))
-            self.emit(  't = %s;' % operation)
-            self.emit(  'if (%s(t, %s, %s))' % (overflow, left, right))
-            self.emit(  '    goto %s;' % label)
+            self.emit('  t = %s;' % operation)
+            self.emit('  if (%s(t, %s, %s))' % (overflow, left, right))
+            self.emit('      goto %s;' % label)
             self.emit('} else {')
             self.emit('%s:' % label)
-            self.emit(  't = %s(e, %s, %s);' % (opfn, left, right))
+            self.emit('  t = %s(e, %s, %s);' % (opfn, left, right))
             self.emit_error_check('t')
             self.emit('}')
             self.emit('%s = t;' % target)
@@ -198,15 +198,15 @@ def opcode(self, opcode: BinOp) -> None:
                       (left, right, overflow, left, right))
             self.emit('    %s = %s;' % (target, operation))
             self.emit('else {')
-            self.emit(  '%s = %s(e, %s, %s);' % (target, opfn, left, right))
+            self.emit('  %s = %s(e, %s, %s);' % (target, opfn, left, right))
             self.emit_error_check(target)
             self.emit('}')
         else:
             # No overflow check needed.
             self.emit('if (MIsShort(%s) && MIsShort(%s))' % (left, right))
             self.emit('    %s = %s;' % (target, operation))
             self.emit('else {')
-            self.emit(  '%s = %s(e, %s, %s);' % (target, opfn, left, right))
+            self.emit('  %s = %s(e, %s, %s);' % (target, opfn, left, right))
             self.emit_error_check(target)
             self.emit('}')
 
@@ -255,7 +255,7 @@ def opcode(self, opcode: CallMethod) -> None:
         target = reg(opcode.target)
         self.get_class_representation(opcode.type)
         rep = self.classes[opcode.type]
-        method = opcode.method.replace('$', '_') # Simple name mangling.
+        method = opcode.method.replace('$', '_')  # Simple name mangling.
         if opcode.static:
             self.direct_call(opcode.target, '%s_%s' % (opcode.type.name(),
                                                        method))
@@ -325,7 +325,7 @@ def generate_class(self, cls: TypeInfo) -> 'ClassRepresentation':
         self.emit_types('    0,')
         self.emit_types('    "%s"' % cls.fullname())
         self.emit_types('};\n')
-        
+
         return rep
 
     def direct_call(self, target: int, funcname: str) -> None:
@@ -394,14 +394,14 @@ class ClassRepresentation:
 
     cname = ''
     fullname = ''
-    
+
     slotmap = Undefined(Dict[str, int])
-    
+
     # Map method name to/from vtable index
     vtable_index = Undefined(Dict[str, int])
-    
+
     defining_class = Undefined(Dict[str, str])
-    
+
     vtable_methods = Undefined(List[str])
 
     def __init__(self, type: TypeInfo, base: 'ClassRepresentation') -> None:
@@ -418,8 +418,8 @@ def __init__(self, type: TypeInfo, base: 'ClassRepresentation') -> None:
                 self.add_method(m, type)
             else:
                 self.slotmap[m] = len(self.slotmap)
-                self.add_method('_' + m, type)    # Getter TODO refactor
-                self.add_method('set_' + m, type) # Setter # TODO refactor
+                self.add_method('_' + m, type)     # Getter TODO refactor
+                self.add_method('set_' + m, type)  # Setter # TODO refactor
 
     def add_method(self, method: str, defining_class: TypeInfo) -> None:
         self.defining_class[method] = defining_class.name()