From 01cd1a5c82a7f51a20a3e8e91725c5df140457b7 Mon Sep 17 00:00:00 2001 From: Jeroen van der Heijden Date: Tue, 19 Dec 2023 13:13:08 +0100 Subject: [PATCH] Invalid class and namespace as check exceptions --- lib/version.py | 2 +- lib/wmiquery.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/version.py b/lib/version.py index 8f41e8f..dd9d509 100644 --- a/lib/version.py +++ b/lib/version.py @@ -1,4 +1,4 @@ # Version string. Examples: # '3.0.0' # '3.0.0-alpha9' -__version__ = '3.0.16-alpha1' +__version__ = '3.0.16-alpha2' diff --git a/lib/wmiquery.py b/lib/wmiquery.py index 90457ad..d14f1ff 100644 --- a/lib/wmiquery.py +++ b/lib/wmiquery.py @@ -4,12 +4,11 @@ import re from aiowmi.query import Query from libprobe.asset import Asset -from libprobe.exceptions import CheckException, IgnoreCheckException -from aiowmi.query import Query +from libprobe.exceptions import CheckException from aiowmi.connection import Connection from aiowmi.connection import Protocol as Service from aiowmi.exceptions import WbemExInvalidClass, WbemExInvalidNamespace -from typing import List, Tuple, Dict, Optional +from typing import List, Tuple, Optional DTYPS_NOT_NULL = { @@ -20,7 +19,7 @@ } QUERY_TIMEOUT = 120 QUERY_CLASS_PAT = re.compile('\s+from\s(\w+)\s?', re.IGNORECASE) - + def get_class(query: str) -> str: o = QUERY_CLASS_PAT.search(query)