From 3c4042a48585ad4dc4277d73f0ea1e73c1fc0437 Mon Sep 17 00:00:00 2001 From: "i.nueske" <i.nueske@indiscale.com> Date: Mon, 16 Dec 2024 17:38:17 +0100 Subject: [PATCH] MNT: Fix assorted simple pylint errors --- src/caosadvancedtools/loadFiles.py | 4 +--- src/caosadvancedtools/pandoc_header_tools.py | 2 -- src/caosadvancedtools/suppressKnown.py | 1 + src/caosadvancedtools/utils.py | 4 ++-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/caosadvancedtools/loadFiles.py b/src/caosadvancedtools/loadFiles.py index 56d50e4d..f29bdd9e 100755 --- a/src/caosadvancedtools/loadFiles.py +++ b/src/caosadvancedtools/loadFiles.py @@ -375,9 +375,7 @@ exclude is given preference over include. logger.addHandler(logging.StreamHandler(stream=sys.stdout)) logger.setLevel(logging.INFO) - con = db.get_connection() - con.timeout = float(args.timeout) - con._login() + db.configure_connection(timeout=float(args.timeout)) loadpath( path=args.path, diff --git a/src/caosadvancedtools/pandoc_header_tools.py b/src/caosadvancedtools/pandoc_header_tools.py index fec27cdb..a0191e5a 100644 --- a/src/caosadvancedtools/pandoc_header_tools.py +++ b/src/caosadvancedtools/pandoc_header_tools.py @@ -107,12 +107,10 @@ it is not at the beginning, it must be preceded by a blank line. textlines = f.readlines() state = 0 - found_0 = -1 found_1 = -1 found_2 = -1 for i, line in enumerate(textlines): if len(line) == 1 and state in {-1, 0}: - found_0 = i state = 0 continue if line.rstrip() == "---" and state == 0: diff --git a/src/caosadvancedtools/suppressKnown.py b/src/caosadvancedtools/suppressKnown.py index 1b31de7e..aada4ef6 100644 --- a/src/caosadvancedtools/suppressKnown.py +++ b/src/caosadvancedtools/suppressKnown.py @@ -28,6 +28,7 @@ class SuppressKnown(logging.Filter): """ def __init__(self, db_file=None): + super().__init__() if db_file: self.db_file = db_file else: diff --git a/src/caosadvancedtools/utils.py b/src/caosadvancedtools/utils.py index 43ecb3f2..f64900c0 100644 --- a/src/caosadvancedtools/utils.py +++ b/src/caosadvancedtools/utils.py @@ -27,7 +27,7 @@ import logging import os import linkahead as db -from linkahead.exceptions import TransactionError +from linkahead.exceptions import TransactionError, BadQueryError logger = logging.getLogger(__name__) @@ -232,7 +232,7 @@ def find_records_that_reference_ids(referenced_ids, rt="", step_size=50): [str(el) for el in subset])) exps = db.execute_query(q_string) record_ids.update([exp.id for exp in exps]) - except Exception as e: + except (TransactionError, BadQueryError) as e: print(e) index += step_size -- GitLab