From 8144030f1239994ba6db875bb795aacce392dfb8 Mon Sep 17 00:00:00 2001 From: Andreas Kloeckner Date: Mon, 7 Sep 2020 11:22:25 -0500 Subject: [PATCH] Placate flake8 quotes linter --- pymbolic/algorithm.py | 4 ++-- pymbolic/geometric_algebra/mapper.py | 2 +- pymbolic/imperative/statement.py | 2 +- pymbolic/imperative/utils.py | 12 ++++++------ pymbolic/interop/maxima.py | 4 ++-- pymbolic/mapper/graphviz.py | 18 +++++++++--------- setup.cfg | 4 ++++ test/test_pymbolic.py | 16 ++++++++-------- 8 files changed, 33 insertions(+), 29 deletions(-) diff --git a/pymbolic/algorithm.py b/pymbolic/algorithm.py index 027aea2..ac13963 100644 --- a/pymbolic/algorithm.py +++ b/pymbolic/algorithm.py @@ -370,10 +370,10 @@ def solve_affine_equations_for(unknowns, equations): if 0: for lhs, rhs in equations: - print(lhs, '=', rhs) + print(lhs, "=", rhs) print("-------------------") for lhs, rhs in six.iteritems(result): - print(lhs, '=', rhs) + print(lhs, "=", rhs) return result diff --git a/pymbolic/geometric_algebra/mapper.py b/pymbolic/geometric_algebra/mapper.py index 5ee9326..f35a2f5 100644 --- a/pymbolic/geometric_algebra/mapper.py +++ b/pymbolic/geometric_algebra/mapper.py @@ -127,7 +127,7 @@ class StringifyMapper(StringifyMapperBase): class GraphvizMapper(GraphvizMapperBase): def map_derivative_source(self, expr): self.lines.append( - "%s [label=\"D[%s]\",shape=ellipse];" % ( + '%s [label="D[%s]\",shape=ellipse];' % ( self.get_id(expr), expr.nabla_id)) if not self.visit(expr, node_printed=True): return diff --git a/pymbolic/imperative/statement.py b/pymbolic/imperative/statement.py index 0c63b20..5b06e62 100644 --- a/pymbolic/imperative/statement.py +++ b/pymbolic/imperative/statement.py @@ -189,7 +189,7 @@ class ConditionalAssignment(ConditionalStatement, Assignment): class Nop(Statement): def __str__(self): - return 'nop' + return "nop" # }}} diff --git a/pymbolic/imperative/utils.py b/pymbolic/imperative/utils.py index 16e538e..633f010 100644 --- a/pymbolic/imperative/utils.py +++ b/pymbolic/imperative/utils.py @@ -36,15 +36,15 @@ logger = logging.getLogger(__name__) def _default_preamble_hook(): # Sets default attributes for nodes and edges. - yield "node [shape=\"box\"];" - yield "edge [dir=\"back\"];" + yield 'node [shape="box"];' + yield 'edge [dir="back"];' def get_dot_dependency_graph( statements, use_stmt_ids=None, preamble_hook=_default_preamble_hook, additional_lines_hook=list, - statement_stringifier=lambda s: str(s).replace("\"", "\\\""), + statement_stringifier=lambda s: str(s).replace('"', r'\"'), # deprecated use_insn_ids=None,): @@ -80,7 +80,7 @@ def get_dot_dependency_graph( stmt_label = statement_stringifier(stmt) tooltip = stmt.id - return "label=\"%s\",shape=\"box\",tooltip=\"%s\"" % (stmt_label, tooltip) + return 'label="%s",shape="box",tooltip="%s"' % (stmt_label, tooltip) lines = list(preamble_hook()) lines.append("rankdir=BT;") @@ -90,7 +90,7 @@ def get_dot_dependency_graph( annotation_dep_graph = {} for stmt in statements: - lines.append("\"%s\" [%s];" % (stmt.id, get_node_attrs(stmt))) + lines.append('"%s" [%s];' % (stmt.id, get_node_attrs(stmt))) for dep in stmt.depends_on: dep_graph.setdefault(stmt.id, set()).add(dep) @@ -130,7 +130,7 @@ def get_dot_dependency_graph( for (stmt_1, stmt_2), annot in six.iteritems(annotation_dep_graph): lines.append( - "%s -> %s [label=\"%s\",style=\"dashed\"]" + '%s -> %s [label="%s",style="dashed"]' % (stmt_2, stmt_1, annot)) lines.extend(additional_lines_hook()) diff --git a/pymbolic/interop/maxima.py b/pymbolic/interop/maxima.py index cfe3397..8d45e53 100644 --- a/pymbolic/interop/maxima.py +++ b/pymbolic/interop/maxima.py @@ -295,12 +295,12 @@ class MaximaKernel: # {{{ check for maxima command self.child.sendline( - "hash \"{command}\"; echo $?".format(command=self.executable)) + 'hash \"{command}\"; echo $?'.format(command=self.executable)) hash_output = self.child.expect(["0\r\n", "1\r\n"]) if hash_output != 0: raise RuntimeError( - "maxima executable \"{command}\" not found" + "maxima executable '{command}' not found" .format(command=self.executable)) # }}} diff --git a/pymbolic/mapper/graphviz.py b/pymbolic/mapper/graphviz.py index f474626..14b0d42 100644 --- a/pymbolic/mapper/graphviz.py +++ b/pymbolic/mapper/graphviz.py @@ -49,13 +49,13 @@ class GraphvizMapper(WalkMapper): "\n".join(" "+line for line in self.lines)) def get_id(self, expr): - "Generate a unique node ID for dot for *expr*" + """Generate a unique node ID for dot for *expr*""" return "id%d" % id(expr) def map_leaf(self, expr): self.lines.append( - "%s [label=\"%s\", shape=box];" % ( + '%s [label="%s", shape=box];' % ( self.get_id(expr), str(expr).replace("\\", "\\\\"))) if self.visit(expr, node_printed=True): @@ -84,7 +84,7 @@ class GraphvizMapper(WalkMapper): if not node_printed: self.lines.append( - "%s [label=\"%s\"];" % ( + '%s [label="%s"];' % ( self.get_id(expr), type(expr).__name__)) @@ -96,7 +96,7 @@ class GraphvizMapper(WalkMapper): def map_sum(self, expr): self.lines.append( - "%s [label=\"+\",shape=circle];" % (self.get_id(expr))) + '%s [label="+",shape=circle];' % (self.get_id(expr))) if not self.visit(expr, node_printed=True): return @@ -107,7 +107,7 @@ class GraphvizMapper(WalkMapper): def map_product(self, expr): self.lines.append( - "%s [label=\"*\",shape=circle];" % (self.get_id(expr))) + '%s [label="*",shape=circle];' % (self.get_id(expr))) if not self.visit(expr, node_printed=True): return @@ -123,7 +123,7 @@ class GraphvizMapper(WalkMapper): node_id = self.generate_unique_id() self.lines.append( - "%s [label=\"%s\",shape=box];" % ( + '%s [label="%s",shape=box];' % ( node_id, expr.name)) if not self.visit(expr, node_printed=True, node_id=node_id): @@ -133,7 +133,7 @@ class GraphvizMapper(WalkMapper): def map_lookup(self, expr): self.lines.append( - "%s [label=\"Lookup[%s]\",shape=box];" % ( + '%s [label="Lookup[%s]",shape=box];' % ( self.get_id(expr), expr.name)) if not self.visit(expr, node_printed=True): return @@ -149,7 +149,7 @@ class GraphvizMapper(WalkMapper): node_id = self.generate_unique_id() self.lines.append( - "%s [label=\"%s\",shape=ellipse];" % ( + '%s [label="%s",shape=ellipse];' % ( node_id, str(expr))) if not self.visit(expr, node_printed=True, node_id=node_id): @@ -163,7 +163,7 @@ class GraphvizMapper(WalkMapper): return super(GraphvizMapper, self).map_call(expr) self.lines.append( - "%s [label=\"Call[%s]\",shape=box];" % ( + '%s [label="Call[%s]",shape=box];' % ( self.get_id(expr), str(expr.function))) if not self.visit(expr, node_printed=True): return diff --git a/setup.cfg b/setup.cfg index 4a1dc55..2089bdf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,3 +2,7 @@ ignore = E126,E127,E128,E123,E226,E241,E242,W503,E402 max-line-length=85 exclude=doc,pymbolic/polynomial.py + +inline-quotes = " +docstring-quotes = """ +multiline-quotes = """ diff --git a/test/test_pymbolic.py b/test/test_pymbolic.py index e199c76..52d40e4 100644 --- a/test/test_pymbolic.py +++ b/test/test_pymbolic.py @@ -40,7 +40,7 @@ except NameError: def assert_parsed_same_as_python(expr_str): # makes sure that has only one line - expr_str, = expr_str.split('\n') + expr_str, = expr_str.split("\n") from pymbolic.interop.ast import ASTToPymbolic import ast ast2p = ASTToPymbolic() @@ -284,13 +284,13 @@ def test_parser(): assert parse("f(x,(y,z),z, name=15, name2=17)") == f( x, (y, z), z, name=15, name2=17) - assert_parsed_same_as_python('5+i if i>=0 else (0 if i<-1 else 10)') + assert_parsed_same_as_python("5+i if i>=0 else (0 if i<-1 else 10)") assert_parsed_same_as_python("0 if 1 if 2 else 3 else 4") assert_parsed_same_as_python("0 if (1 if 2 else 3) else 4") assert_parsed_same_as_python("(2, 3,)") with pytest.deprecated_call(): - parse('1+if(0, 1, 2)') + parse("1+if(0, 1, 2)") # }}} @@ -313,8 +313,8 @@ def test_mappers(): def test_func_dep_consistency(): from pymbolic import var from pymbolic.mapper.dependency import DependencyMapper - f = var('f') - x = var('x') + f = var("f") + x = var("x") dep_map = DependencyMapper(include_calls="descend_args") assert dep_map(f(x)) == set([x]) assert dep_map(f(x=x)) == set([x]) @@ -322,8 +322,8 @@ def test_func_dep_consistency(): def test_conditions(): from pymbolic import var - x = var('x') - y = var('y') + x = var("x") + y = var("y") assert str(x.eq(y).and_(x.le(5))) == "x == y and x <= 5" @@ -644,7 +644,7 @@ def test_differentiator_flags_for_nonsmooth_and_discontinuous(): import pymbolic.functions as pf from pymbolic.mapper.differentiator import differentiate - x = prim.Variable('x') + x = prim.Variable("x") with pytest.raises(ValueError): differentiate(pf.fabs(x), x) -- GitLab