diff --git a/CHANGELOG.md b/CHANGELOG.md index 68b744c09..60dcf37dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ #### Collectors - `intelmq.bots.collectors.shadowserver.collector_reports_api.py`: - Fixed behaviour if parameter `types` value is empty string, behave the same way as not set, not like no type. +- `intelmq.bots.collectors.misp`: Use `PyMISP` class instead of deprecated `ExpandedPyMISP` (PR#2532 by Radek Vyhnal) #### Parsers - `intelmq.bots.parsers.shadowserver._config`: @@ -32,6 +33,7 @@ #### Experts - `intelmq.bots.experts.securitytxt`: - Added new bot (PR#2538 by Frank Westers and Sebastian Wagner) +- `intelmq.bots.experts.misp`: Use `PyMISP` class instead of deprecated `ExpandedPyMISP` (PR#2532 by Radek Vyhnal) #### Outputs - `intelmq.bots.outputs.cif3.output`: diff --git a/intelmq/bots/collectors/misp/collector.py b/intelmq/bots/collectors/misp/collector.py index b32417bc4..b78555f00 100644 --- a/intelmq/bots/collectors/misp/collector.py +++ b/intelmq/bots/collectors/misp/collector.py @@ -25,10 +25,7 @@ from intelmq.lib.exceptions import MissingDependencyError try: - try: - from pymisp import ExpandedPyMISP as PyMISP - except ImportError: - from pymisp import PyMISP + from pymisp import PyMISP except ImportError: PyMISP = None import_fail_reason = 'import' diff --git a/intelmq/bots/experts/misp/expert.py b/intelmq/bots/experts/misp/expert.py index 149f8ef33..81c013d50 100644 --- a/intelmq/bots/experts/misp/expert.py +++ b/intelmq/bots/experts/misp/expert.py @@ -17,9 +17,9 @@ from intelmq.lib.exceptions import MissingDependencyError try: - from pymisp import ExpandedPyMISP + from pymisp import PyMISP except ImportError: - ExpandedPyMISP = None + PyMISP = None class MISPExpertBot(ExpertBot): @@ -28,13 +28,13 @@ class MISPExpertBot(ExpertBot): misp_url: str = "" def init(self): - if ExpandedPyMISP is None: + if PyMISP is None: raise MissingDependencyError('pymisp', '>=2.4.117.3') # Initialize MISP connection - self.misp = ExpandedPyMISP(self.misp_url, - self.misp_key, - self.http_verify_cert) + self.misp = PyMISP(self.misp_url, + self.misp_key, + self.http_verify_cert) def process(self): event = self.receive_message()