Added majority of type annotations (to a by now outdated version)

cibuildwheel/bashlex_eval.py

@@ -2,12 +2,14 @@ import shlex
 import subprocess
 from collections import namedtuple
 
-import bashlex
+from typing import Dict
+
+import bashlex  # type: ignore
 
 NodeExecutionContext = namedtuple('NodeExecutionContext', ['environment', 'input'])
 
 
-def evaluate(value, environment):
+def evaluate(value: str, environment: Dict[str, str]) -> str:
     if not value:
         # empty string evaluates to empty string
         # (but trips up bashlex)
@@ -20,24 +22,24 @@ def evaluate(value, environment):
 
     value_word_node = command_node.parts[0]
 
-    return evaluate_node(
+    return evaluate_node(  # type: ignore
         value_word_node,
         context=NodeExecutionContext(environment=environment, input=value)
     )
 
 
-def evaluate_node(node, context):
+def evaluate_node(node, context):  # type: ignore
     if node.kind == 'word':
-        return evaluate_word_node(node, context=context)
+        return evaluate_word_node(node, context=context)  # type: ignore
     elif node.kind == 'commandsubstitution':
-        return evaluate_command_node(node.command, context=context)
+        return evaluate_command_node(node.command, context=context)  # type: ignore
     elif node.kind == 'parameter':
-        return evaluate_parameter_node(node, context=context)
+        return evaluate_parameter_node(node, context=context)  # type: ignore
     else:
         raise ValueError('Unsupported bash construct: "%s"' % node.word)
 
 
-def evaluate_word_node(node, context):
+def evaluate_word_node(node, context):  # type: ignore
     word_start = node.pos[0]
     word_end = node.pos[1]
     word_string = context.input[word_start:word_end]
@@ -51,7 +53,7 @@ def evaluate_word_node(node, context):
         for i in range(part_start, part_end):
             letters[i] = None
 
-        letters[part_start] = evaluate_node(part, context=context)
+        letters[part_start] = evaluate_node(part, context=context)  # type: ignore
 
     # remove the None letters and concat
     value = ''.join(l for l in letters if l is not None)
@@ -60,11 +62,11 @@ def evaluate_word_node(node, context):
     return ' '.join(word.strip() for word in shlex.split(value))
 
 
-def evaluate_command_node(node, context):
-    words = [evaluate_node(part, context=context) for part in node.parts]
+def evaluate_command_node(node, context):  # type: ignore
+    words = [evaluate_node(part, context=context) for part in node.parts]  # type: ignore
     command = ' '.join(words)
     return subprocess.check_output(shlex.split(command), env=context.environment, universal_newlines=True)
 
 
-def evaluate_parameter_node(node, context):
+def evaluate_parameter_node(node, context):  # type: ignore
     return context.environment.get(node.value, '')