prettify: fix logger/exception-handling issues

cp2k · Feb 24, 2020 · fbd5a85 · fbd5a85
1 parent ae3c58d
commit fbd5a85
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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"])