From 96b5edf725406aaf0a881022284224df4b975473 Mon Sep 17 00:00:00 2001 From: Christophe Haen Date: Tue, 3 Oct 2023 17:51:20 +0200 Subject: [PATCH] test: update to pylint 3.0.0 --- .../DirectoryMetadata/DirectoryMetadata.py | 7 ++----- .../DB/FileCatalogComponents/FileMetadata/FileMetadata.py | 7 ++----- .../scripts/dirac_rss_query_dtcache.py | 6 ++++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/DirectoryMetadata/DirectoryMetadata.py b/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/DirectoryMetadata/DirectoryMetadata.py index 5c46db18faf..d6a511a31f9 100644 --- a/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/DirectoryMetadata/DirectoryMetadata.py +++ b/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/DirectoryMetadata/DirectoryMetadata.py @@ -350,11 +350,8 @@ def getDirectoryMetaParameters(self, dpath, credDict, inherited=True): return S_OK({}) metaDict = {} for _dID, key, value in result["Value"]: - if key in metaDict: - if isinstance(metaDict[key], list): - metaDict[key].append(value) - else: - metaDict[key] = [metaDict[key]].append(value) + if isinstance(metaDict.get(key), list): + metaDict[key].append(value) else: metaDict[key] = value diff --git a/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/FileMetadata/FileMetadata.py b/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/FileMetadata/FileMetadata.py index 5b5a248362e..3738866aba5 100644 --- a/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/FileMetadata/FileMetadata.py +++ b/src/DIRAC/DataManagementSystem/DB/FileCatalogComponents/FileMetadata/FileMetadata.py @@ -358,11 +358,8 @@ def __getFileMetaParameters(self, fileID, credDict): return S_OK({}) metaDict = {} for fileID, key, value in result["Value"]: - if key in metaDict: - if isinstance(metaDict[key], list): - metaDict[key].append(value) - else: - metaDict[key] = [metaDict[key]].append(value) + if isinstance(metaDict.get(key), list): + metaDict[key].append(value) else: metaDict[key] = value diff --git a/src/DIRAC/ResourceStatusSystem/scripts/dirac_rss_query_dtcache.py b/src/DIRAC/ResourceStatusSystem/scripts/dirac_rss_query_dtcache.py index a616153df08..0df80307717 100755 --- a/src/DIRAC/ResourceStatusSystem/scripts/dirac_rss_query_dtcache.py +++ b/src/DIRAC/ResourceStatusSystem/scripts/dirac_rss_query_dtcache.py @@ -43,10 +43,12 @@ def parseSwitches(): args = Script.getPositionalArgs() if not args: error("Missing mandatory 'query' argument") + DIRACExit(1) elif not args[0].lower() in ("select", "add", "delete"): error("Missing mandatory argument") - else: - query = args[0].lower() + DIRACExit(1) + + query = args[0].lower() switches = dict(Script.getUnprocessedSwitches())