Missing and extra spaces, missing empty lines, unused imports and
variables, long lines.
Decided to just comment out the unused 'tail' and 'head' as they
seem useful in documenting the meaning of the words.
Files added to flake8-check to avoid future issues.
Signed-off-by: Ilya Maximets <i.maxim...@ovn.org>
---
ovsdb/automake.mk | 1 +
ovsdb/dot2pic | 6 +++---
ovsdb/ovsdb-dot.in | 41 ++++++++++++++++++++++-------------------
3 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk
index e8149224b..d484fe9de 100644
--- a/ovsdb/automake.mk
+++ b/ovsdb/automake.mk
@@ -120,6 +120,7 @@ ovsdb/ovsdb-doc: python/ovs/dirs.py
# ovsdb-dot
EXTRA_DIST += ovsdb/ovsdb-dot.in ovsdb/dot2pic
+FLAKE8_PYFILES += ovsdb/ovsdb-dot.in ovsdb/dot2pic
noinst_SCRIPTS += ovsdb/ovsdb-dot
CLEANFILES += ovsdb/ovsdb-dot
OVSDB_DOT = $(run_python) $(srcdir)/ovsdb/ovsdb-dot.in
diff --git a/ovsdb/dot2pic b/ovsdb/dot2pic
index 2f858e19d..3db6444de 100755
--- a/ovsdb/dot2pic
+++ b/ovsdb/dot2pic
@@ -17,6 +17,7 @@
import getopt
import sys
+
def dot2pic(src, dst):
scale = 1.0
while True:
@@ -49,8 +50,8 @@ def dot2pic(src, dst):
dst.write("box at %f,%f wid %f height %f\n"
% (x, y, width, height))
elif command == 'edge':
- tail = words[1]
- head = words[2]
+ # tail = words[1]
+ # head = words[2]
n = int(words[3])
# Extract x,y coordinates.
@@ -114,4 +115,3 @@ else:
if font_scale:
print(".ps %+d" % font_scale)
print(".PE")
-
diff --git a/ovsdb/ovsdb-dot.in b/ovsdb/ovsdb-dot.in
index 41b986c0a..f1eefd49c 100755
--- a/ovsdb/ovsdb-dot.in
+++ b/ovsdb/ovsdb-dot.in
@@ -1,15 +1,13 @@
#! @PYTHON3@
-from datetime import date
import ovs.db.error
import ovs.db.schema
import getopt
-import os
-import re
import sys
argv0 = sys.argv[0]
+
def printEdge(tableName, type, baseType, label):
if baseType.ref_table_name:
if type.n_min == 0:
@@ -31,38 +29,42 @@ def printEdge(tableName, type, baseType, label):
options['label'] = '"%s%s"' % (label, arity)
if baseType.ref_type == 'weak':
options['style'] = 'dotted'
- print ("\t%s -> %s [%s];" % (
+ print("\t%s -> %s [%s];" % (
tableName,
baseType.ref_table_name,
- ', '.join(['%s=%s' % (k,v) for k,v in options.items()])))
+ ', '.join(['%s=%s' % (k, v) for k, v in options.items()])))
+
def schemaToDot(schemaFile, arrows):
schema = ovs.db.schema.DbSchema.from_json(ovs.json.from_file(schemaFile))
- print ("digraph %s {" % schema.name)
- print ('\trankdir=LR;')
- print ('\tsize="6.5,4";')
- print ('\tmargin="0";')
- print ("\tnode [shape=box];")
+ print("digraph %s {" % schema.name)
+ print('\trankdir=LR;')
+ print('\tsize="6.5,4";')
+ print('\tmargin="0";')
+ print("\tnode [shape=box];")
if not arrows:
- print ("\tedge [dir=none, arrowhead=none, arrowtail=none];")
+ print("\tedge [dir=none, arrowhead=none, arrowtail=none];")
for tableName, table in schema.tables.items():
options = {}
if table.is_root:
options['style'] = 'bold'
- print ("\t%s [%s];" % (
+ print("\t%s [%s];" % (
tableName,
- ', '.join(['%s=%s' % (k,v) for k,v in options.items()])))
+ ', '.join(['%s=%s' % (k, v) for k, v in options.items()])))
for columnName, column in table.columns.items():
if column.type.value:
- printEdge(tableName, column.type, column.type.key, "%s key" %
columnName)
- printEdge(tableName, column.type, column.type.value, "%s
value" % columnName)
+ printEdge(tableName, column.type, column.type.key,
+ "%s key" % columnName)
+ printEdge(tableName, column.type, column.type.value,
+ "%s value" % columnName)
else:
printEdge(tableName, column.type, column.type.key, columnName)
- print ("}");
+ print("}")
+
def usage():
- print ("""\
+ print("""\
%(argv0)s: compiles ovsdb schemas to graphviz format
Prints a .dot file that "dot" can render to an entity-relationship diagram
usage: %(argv0)s [OPTIONS] SCHEMA
@@ -75,12 +77,13 @@ The following options are also available:
""" % {'argv0': argv0})
sys.exit(0)
+
if __name__ == "__main__":
try:
try:
options, args = getopt.gnu_getopt(sys.argv[1:], 'hV',
['no-arrows',
- 'help', 'version',])
+ 'help', 'version'])
except getopt.GetoptError as geo:
sys.stderr.write("%s: %s\n" % (argv0, geo.msg))
sys.exit(1)
@@ -92,7 +95,7 @@ if __name__ == "__main__":
elif key in ['-h', '--help']:
usage()
elif key in ['-V', '--version']:
- print ("ovsdb-dot (Open vSwitch) @VERSION@")
+ print("ovsdb-dot (Open vSwitch) @VERSION@")
else:
sys.exit(0)
--
2.44.0
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
