style: apply black via pre-commit run -a
This commit is contained in:
committed by
Henry Schreiner
parent
9cbed6a9be
commit
178aaea6c7
@@ -8,7 +8,9 @@ EnvironmentExecutor = Callable[[List[str], Dict[str, str]], str]
|
||||
|
||||
|
||||
def local_environment_executor(command: List[str], env: Dict[str, str]) -> str:
|
||||
return subprocess.run(command, env=env, universal_newlines=True, stdout=subprocess.PIPE, check=True).stdout
|
||||
return subprocess.run(
|
||||
command, env=env, universal_newlines=True, stdout=subprocess.PIPE, check=True
|
||||
).stdout
|
||||
|
||||
|
||||
class NodeExecutionContext(NamedTuple):
|
||||
@@ -17,7 +19,9 @@ class NodeExecutionContext(NamedTuple):
|
||||
executor: EnvironmentExecutor
|
||||
|
||||
|
||||
def evaluate(value: str, environment: Dict[str, str], executor: Optional[EnvironmentExecutor] = None) -> str:
|
||||
def evaluate(
|
||||
value: str, environment: Dict[str, str], executor: Optional[EnvironmentExecutor] = None
|
||||
) -> str:
|
||||
if not value:
|
||||
# empty string evaluates to empty string
|
||||
# (but trips up bashlex)
|
||||
@@ -32,7 +36,9 @@ def evaluate(value: str, environment: Dict[str, str], executor: Optional[Environ
|
||||
|
||||
return evaluate_node(
|
||||
value_word_node,
|
||||
context=NodeExecutionContext(environment=environment, input=value, executor=executor or local_environment_executor)
|
||||
context=NodeExecutionContext(
|
||||
environment=environment, input=value, executor=executor or local_environment_executor
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
@@ -53,7 +59,7 @@ def evaluate_word_node(node: bashlex.ast.node, context: NodeExecutionContext) ->
|
||||
value: str = node.word
|
||||
|
||||
for part in node.parts:
|
||||
part_string = context.input[part.pos[0]:part.pos[1]]
|
||||
part_string = context.input[part.pos[0] : part.pos[1]]
|
||||
part_value = evaluate_node(part, context=context)
|
||||
|
||||
if part_string not in value:
|
||||
@@ -74,7 +80,9 @@ def evaluate_command_node(node: bashlex.ast.node, context: NodeExecutionContext)
|
||||
return evaluate_nodes_as_simple_command(node.parts, context=context)
|
||||
|
||||
|
||||
def evaluate_nodes_as_compound_command(nodes: Sequence[bashlex.ast.node], context: NodeExecutionContext) -> str:
|
||||
def evaluate_nodes_as_compound_command(
|
||||
nodes: Sequence[bashlex.ast.node], context: NodeExecutionContext
|
||||
) -> str:
|
||||
# bashlex doesn't support any operators besides ';' inside command
|
||||
# substitutions, so we only need to handle that case. We do so assuming
|
||||
# that `set -o errexit` is on, because it's easier to code!
|
||||
@@ -92,7 +100,9 @@ def evaluate_nodes_as_compound_command(nodes: Sequence[bashlex.ast.node], contex
|
||||
return result
|
||||
|
||||
|
||||
def evaluate_nodes_as_simple_command(nodes: List[bashlex.ast.node], context: NodeExecutionContext) -> str:
|
||||
def evaluate_nodes_as_simple_command(
|
||||
nodes: List[bashlex.ast.node], context: NodeExecutionContext
|
||||
) -> str:
|
||||
command = [evaluate_node(part, context=context) for part in nodes]
|
||||
return context.executor(command, context.environment)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user