From be1560a0ece794e0f047e6e3c18d4b78ec746b15 Mon Sep 17 00:00:00 2001 From: parmentelat Date: Sun, 20 May 2018 14:40:59 +0200 Subject: [PATCH] other minor tweaks - doc generation should still be broken --- PLC/Methods/__init__.py | 1 - doc/DocBookLocal.py | 13 +++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/PLC/Methods/__init__.py b/PLC/Methods/__init__.py index dbf9959..000edba 100644 --- a/PLC/Methods/__init__.py +++ b/PLC/Methods/__init__.py @@ -20,7 +20,6 @@ contents = [ for dir, pattern in contents: prefix = len(dir) + 1 matches = glob.glob("{}/{}".format(dir, pattern)) - print(matches) for match in matches: filename = match[prefix:][:-3] python_name = filename if dir == '.' \ diff --git a/doc/DocBookLocal.py b/doc/DocBookLocal.py index 317330e..2bed21a 100755 --- a/doc/DocBookLocal.py +++ b/doc/DocBookLocal.py @@ -14,13 +14,14 @@ for method in methods: try: good_api = api.callable(method) good_apis.append(good_api) - except PLCInvalidAPIMethod, e: - bad_apis.append((method,e)) + except PLCInvalidAPIMethod as exc: + bad_apis.append((method, exc)) DocBook(good_apis).Process() -if len(bad_apis): - sys.stderr.write("UNEXPECTED: There are %d non-callable methods:\n"%(len(bad_apis))) - for bad_api,e in bad_apis: - sys.stderr.write("\t%s:%s\n" % (bad_api,e)) +if bad_apis: + sys.stderr.write("UNEXPECTED: There are %d non-callable methods:\n" + % (len(bad_apis))) + for method, exc in bad_apis: + sys.stderr.write("\tmethod=<%s> exc=%s\n" % (method, exc)) sys.exit(-1) -- 2.43.0