From 5c718c5379ccb7bfa32bdd12a53b5bc9d9134106 Mon Sep 17 00:00:00 2001 From: chrisr3d Date: Sat, 8 Sep 2018 02:53:15 +0200 Subject: [PATCH] fix: Making python 3.5 happy with the exception type ImportError --- misp_modules/modules/expansion/dbl_spamhaus.py | 2 +- misp_modules/modules/expansion/rbl.py | 2 +- misp_modules/modules/expansion/sigma_queries.py | 2 +- misp_modules/modules/expansion/sigma_syntax_validator.py | 2 +- .../modules/expansion/stix2_pattern_syntax_validator.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/misp_modules/modules/expansion/dbl_spamhaus.py b/misp_modules/modules/expansion/dbl_spamhaus.py index f78cb74..306ea21 100644 --- a/misp_modules/modules/expansion/dbl_spamhaus.py +++ b/misp_modules/modules/expansion/dbl_spamhaus.py @@ -7,7 +7,7 @@ try: resolver = dns.resolver.Resolver() resolver.timeout = 0.2 resolver.lifetime = 0.2 -except ModuleNotFoundError: +except ImportError: print("dnspython3 is missing, use 'pip install dnspython3' to install it.") sys.exit(0) diff --git a/misp_modules/modules/expansion/rbl.py b/misp_modules/modules/expansion/rbl.py index 7aac103..6626760 100644 --- a/misp_modules/modules/expansion/rbl.py +++ b/misp_modules/modules/expansion/rbl.py @@ -6,7 +6,7 @@ try: resolver = dns.resolver.Resolver() resolver.timeout = 0.2 resolver.lifetime = 0.2 -except ModuleNotFoundError: +except ImportError: print("dnspython3 is missing, use 'pip install dnspython3' to install it.") sys.exit(0) diff --git a/misp_modules/modules/expansion/sigma_queries.py b/misp_modules/modules/expansion/sigma_queries.py index e37df23..d263245 100644 --- a/misp_modules/modules/expansion/sigma_queries.py +++ b/misp_modules/modules/expansion/sigma_queries.py @@ -3,7 +3,7 @@ try: from sigma.parser import SigmaCollectionParser from sigma.config import SigmaConfiguration from sigma.backends import getBackend, BackendOptions -except ModuleNotFoundError: +except ImportError: print("sigma or yaml is missing, use 'pip3 install sigmatools' to install it.") misperrors = {'error': 'Error'} diff --git a/misp_modules/modules/expansion/sigma_syntax_validator.py b/misp_modules/modules/expansion/sigma_syntax_validator.py index 6452654..e5cc335 100644 --- a/misp_modules/modules/expansion/sigma_syntax_validator.py +++ b/misp_modules/modules/expansion/sigma_syntax_validator.py @@ -3,7 +3,7 @@ try: import yaml from sigma.parser import SigmaParser from sigma.config import SigmaConfiguration -except ModuleNotFoundError: +except ImportError: print("sigma or yaml is missing, use 'pip3 install sigmatools' to install it.") misperrors = {'error': 'Error'} diff --git a/misp_modules/modules/expansion/stix2_pattern_syntax_validator.py b/misp_modules/modules/expansion/stix2_pattern_syntax_validator.py index bf5d408..78307a4 100644 --- a/misp_modules/modules/expansion/stix2_pattern_syntax_validator.py +++ b/misp_modules/modules/expansion/stix2_pattern_syntax_validator.py @@ -1,7 +1,7 @@ import json try: from stix2patterns.validator import run_validator -except ModuleNotFoundError: +except ImportError: print("stix2 patterns python library is missing, use 'pip3 install stix2-patterns' to install it.") misperrors = {'error': 'Error'}