From fbd5a8579c10733d8bba8d159512e96d27f112ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiziano=20M=C3=BCller?= Date: Thu, 13 Feb 2020 13:58:51 +0100 Subject: [PATCH] prettify: fix logger/exception-handling issues --- tools/prettify/prettify.py | 6 +++--- tools/prettify/prettify_cp2k/normalizeFortranFile.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/prettify/prettify.py b/tools/prettify/prettify.py index 93fc614d72..a10e09a554 100755 --- a/tools/prettify/prettify.py +++ b/tools/prettify/prettify.py @@ -449,9 +449,9 @@ def main(argv): shandler.setLevel(level) shandler.setFormatter(logging.Formatter("%(levelname)s %(ffilename)s: %(message)s")) - prettify_logger = logging.getLogger("prettify-logger") - prettify_logger.setLevel(level) - prettify_logger.addHandler(shandler) + logger = logging.getLogger("prettify-logger") + logger.setLevel(level) + logger.addHandler(shandler) failure = 0 total_prettified = 0 diff --git a/tools/prettify/prettify_cp2k/normalizeFortranFile.py b/tools/prettify/prettify_cp2k/normalizeFortranFile.py index 6e03d1c8bf..3551644561 100644 --- a/tools/prettify/prettify_cp2k/normalizeFortranFile.py +++ b/tools/prettify/prettify_cp2k/normalizeFortranFile.py @@ -1295,9 +1295,9 @@ def rewriteFortranFile( else: implicitUses = None if modulesDict["commonUses"]: + inc_fn = COMMON_USES_RE.match(modulesDict["commonUses"]).group(1) + inc_absfn = os.path.join(os.path.dirname(orig_filename), inc_fn) try: - inc_fn = COMMON_USES_RE.match(modulesDict["commonUses"]).group(1) - inc_absfn = os.path.join(os.path.dirname(orig_filename), inc_fn) with open(inc_absfn, "r") as fhandle: implicitUsesRaw = parseUse(fhandle) implicitUses = prepareImplicitUses(implicitUsesRaw["modules"])