0.0.12: Python3 fix (basestring->str)

PatrowlEnginesUtils/PatrowlEngine.py

@@ -140,7 +140,7 @@ def reloadconfig(self):
     def had_options(self, options):
         """Check if the engine is started with options."""
         opts = []
-        if isinstance(options, basestring):
+        if isinstance(options, str):
             opts.append(options)
         elif isinstance(options, list):
             opts = options
@@ -326,6 +326,7 @@ def _parse_results(self, scan_id):
             "low": 0,
             "medium": 0,
             "high": 0,
+            "critical": 0,
         }
 
         for issue in self.scans[scan_id]["findings"]:
@@ -338,6 +339,7 @@ def _parse_results(self, scan_id):
             "nb_low": nb_vulns["low"],
             "nb_medium": nb_vulns["medium"],
             "nb_high": nb_vulns["high"],
+            "nb_critical": nb_vulns["critical"],
             "engine_name": self.name,
             "engine_version": self.version
         }
@@ -495,7 +497,7 @@ def add_issue(self, issue):
     def had_options(self, options):
         """Check if the scan is started with options."""
         opts = []
-        if isinstance(options, basestring):
+        if isinstance(options, str):
             opts.append(options)
         elif isinstance(options, list):
             opts = options

PatrowlEnginesUtils/__init__.py

@@ -3,7 +3,7 @@
 
 
 __title__ = 'patrowl_engine_utils'
-__version__ = '0.0.11'
+__version__ = '0.0.12'
 __author__ = 'Nicolas MATTIOCCO'
 __license__ = 'AGPLv3'
 __copyright__ = 'Copyright (C) 2018-2019 Nicolas Mattiocco - @MaKyOtOx'

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name='PatrowlEnginesUtils',
-    version='0.0.11',
+    version='0.0.12',
     description='Common classes for PatrowlEngines',
     url='https://github.com/Patrowl/PatrowlEnginesUtils',
     author='Nicolas Mattiocco',