Skip to content

Commit ff24cde

Browse files
committed
Fixup: stabilize black usage
1 parent 91d5f31 commit ff24cde

File tree

3 files changed

+43
-19
lines changed

3 files changed

+43
-19
lines changed

Diff for: pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ dev = [
5151
]
5252
tests = [
5353
'chardet',
54-
'black',
5554
'tox',
5655
'parameterized',
5756
'unittest-parallel',

Diff for: src/pydot/__init__.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""An interface to GraphViz."""
2+
23
import logging
34

45
__author__ = "Ero Carrera"
@@ -11,5 +12,5 @@
1112
_logger.debug("pydot %s", __version__)
1213

1314

14-
from pydot.exceptions import *
15-
from pydot.core import *
15+
from pydot.exceptions import * # noqa: E402, F403
16+
from pydot.core import * # noqa: F403, E402

Diff for: src/pydot/dot_parser.py

+40-16
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
Author: Michael Krause <[email protected]>
88
Fixes by: Ero Carrera <[email protected]>
99
"""
10+
1011
import logging
1112

1213
from pyparsing import (
@@ -159,7 +160,9 @@ def update_parent_graph_hierarchy(g, parent_graph=None, level=0):
159160
if vertex["parent_graph"] is g:
160161
pass
161162
else:
162-
vertex["parent_graph"].set_parent_graph(parent_graph)
163+
vertex["parent_graph"].set_parent_graph(
164+
parent_graph
165+
)
163166

164167

165168
def add_defaults(element, defaults):
@@ -169,7 +172,9 @@ def add_defaults(element, defaults):
169172
d[key] = value
170173

171174

172-
def add_elements(g, toks, defaults_graph=None, defaults_node=None, defaults_edge=None):
175+
def add_elements(
176+
g, toks, defaults_graph=None, defaults_node=None, defaults_edge=None
177+
):
173178
if defaults_graph is None:
174179
defaults_graph = {}
175180
if defaults_node is None:
@@ -192,7 +197,9 @@ def add_elements(g, toks, defaults_graph=None, defaults_node=None, defaults_edge
192197

193198
elif isinstance(element, ParseResults):
194199
for e in element:
195-
add_elements(g, [e], defaults_graph, defaults_node, defaults_edge)
200+
add_elements(
201+
g, [e], defaults_graph, defaults_node, defaults_edge
202+
)
196203

197204
elif isinstance(element, DefaultStatement):
198205
if element.default_type == "graph":
@@ -209,7 +216,9 @@ def add_elements(g, toks, defaults_graph=None, defaults_node=None, defaults_edge
209216
defaults_edge.update(element.attrs)
210217

211218
else:
212-
raise ValueError(f"Unknown DefaultStatement: {element.default_type}")
219+
raise ValueError(
220+
f"Unknown DefaultStatement: {element.default_type}"
221+
)
213222

214223
elif isinstance(element, P_AttrList):
215224
g.obj_dict["attributes"].update(element.attrs)
@@ -300,7 +309,9 @@ def push_edge_stmt(s, loc, toks):
300309
e.append(pydot.Edge(n_prev, n_next[0] + n_next_port, **attrs))
301310

302311
elif isinstance(toks[2][0], pydot.Graph):
303-
e.append(pydot.Edge(n_prev, pydot.frozendict(toks[2][0].obj_dict), **attrs))
312+
e.append(
313+
pydot.Edge(n_prev, pydot.frozendict(toks[2][0].obj_dict), **attrs)
314+
)
304315

305316
elif isinstance(toks[2][0], pydot.Node):
306317
node = toks[2][0]
@@ -315,7 +326,9 @@ def push_edge_stmt(s, loc, toks):
315326
# if the target of this edge is the name of a node
316327
elif isinstance(toks[2][0], str):
317328
for n_next in [n for n in tuple(toks)[2::2]]:
318-
if isinstance(n_next, P_AttrList) or not isinstance(n_next[0], str):
329+
if isinstance(n_next, P_AttrList) or not isinstance(
330+
n_next[0], str
331+
):
319332
continue
320333

321334
n_next_port = do_node_ports(n_next)
@@ -390,9 +403,9 @@ def graph_definition():
390403

391404
ID = (identifier | html_text | double_quoted_string).setName("ID")
392405

393-
float_number = Combine(Optional(minus) + OneOrMore(Word(nums + "."))).setName(
394-
"float_number"
395-
)
406+
float_number = Combine(
407+
Optional(minus) + OneOrMore(Word(nums + "."))
408+
).setName("float_number")
396409

397410
righthand_id = (float_number | ID).setName("righthand_id")
398411

@@ -417,7 +430,9 @@ def graph_definition():
417430
lbrack.suppress() + Optional(a_list) + rbrack.suppress()
418431
).setName("attr_list")
419432

420-
attr_stmt = (Group(graph_ | node_ | edge_) + attr_list).setName("attr_stmt")
433+
attr_stmt = (Group(graph_ | node_ | edge_) + attr_list).setName(
434+
"attr_stmt"
435+
)
421436

422437
edgeop = (Literal("--") | Literal("->")).setName("edgeop")
423438

@@ -434,17 +449,26 @@ def graph_definition():
434449
edgeRHS = OneOrMore(edgeop + edge_point)
435450
edge_stmt = edge_point + edgeRHS + Optional(attr_list)
436451

437-
subgraph = Group(subgraph_ + Optional(ID) + graph_stmt).setName("subgraph")
438-
439-
edge_point << Group(subgraph | graph_stmt | node_id).setName("edge_point")
452+
subgraph = Group(subgraph_ + Optional(ID) + graph_stmt).setName(
453+
"subgraph"
454+
)
440455

441-
node_stmt = (node_id + Optional(attr_list) + Optional(semi.suppress())).setName(
442-
"node_stmt"
456+
edge_point << Group(subgraph | graph_stmt | node_id).setName(
457+
"edge_point"
443458
)
444459

460+
node_stmt = (
461+
node_id + Optional(attr_list) + Optional(semi.suppress())
462+
).setName("node_stmt")
463+
445464
assignment = (ID + equals + righthand_id).setName("assignment")
446465
stmt = (
447-
assignment | edge_stmt | attr_stmt | subgraph | graph_stmt | node_stmt
466+
assignment
467+
| edge_stmt
468+
| attr_stmt
469+
| subgraph
470+
| graph_stmt
471+
| node_stmt
448472
).setName("stmt")
449473
stmt_list << OneOrMore(stmt + Optional(semi.suppress()))
450474

0 commit comments

Comments
 (0)