Python2 compatibility

Author: To-om

cortexutils/analyzer.py

@@ -79,10 +79,12 @@ def build_artifact(self, data_type, data, **kwargs):
                 (dst, filename) = tempfile.mkstemp(dir=os.path.join(self.job_directory, "output"))
                 with open(data, 'r') as src:
                     copyfileobj(src, os.fdopen(dst, 'w'))
-                    return {**kwargs, 'dataType': data_type, 'file': ntpath.basename(filename),
-                            'filename': ntpath.basename(data)}
+                    kwargs.update({'dataType': data_type, 'file': ntpath.basename(filename),
+                                   'filename': ntpath.basename(data)})
+                    return kwargs
         else:
-            return {**kwargs, 'dataType': data_type, 'data': data}
+            kwargs.update({'dataType': data_type, 'data': data})
+            return kwargs
 
     def report(self, full_report, ensure_ascii=False):
         """Returns a json dict via stdout.
@@ -96,15 +98,12 @@ def report(self, full_report, ensure_ascii=False):
         except Exception:
             pass
 
-        report = {
+        super(Analyzer, self).report({
             'success': True,
             'summary': summary,
             'artifacts': self.artifacts(full_report),
             'full': full_report
-        }
-        os.makedirs('%s/output' % self.job_directory, exist_ok=True)
-        with open('%s/output/output.json' % self.job_directory, mode='w') as f_output:
-            json.dump(report, f_output, ensure_ascii=ensure_ascii)
+        }, ensure_ascii)
 
     def run(self):
         """Overwritten by analyzers"""

cortexutils/responder.py

@@ -51,15 +51,11 @@ def report(self, full_report, ensure_ascii=False):
             operation_list = self.operations(full_report)
         except Exception:
             pass
-
-        report = {
+        super(Responder, self).report({
             'success': True,
             'full': full_report,
             'operations': operation_list
-        }
-        os.makedirs('%s/output' % self.job_directory, exist_ok=True)
-        with open('%s/output/output.json' % self.job_directory, mode='w') as f_output:
-            json.dump(report, f_output, ensure_ascii=ensure_ascii)
+        }, ensure_ascii)
 
     def run(self):
         """Overwritten by responders"""

cortexutils/worker.py

@@ -8,7 +8,7 @@
 import select
 
 
-class Worker:
+class Worker(object):
     READ_TIMEOUT = 3  # seconds
 
     def __init__(self, job_directory):
@@ -115,7 +115,10 @@ def __write_output(self, data, ensure_ascii=False):
         if self.job_directory is None:
             json.dump(data, sys.stdout, ensure_ascii=ensure_ascii)
         else:
-            os.makedirs('%s/output' % self.job_directory, exist_ok=True)
+            try:
+                os.makedirs('%s/output' % self.job_directory)
+            except:
+                pass
             with open('%s/output/output.json' % self.job_directory, mode='w') as f_output:
                 json.dump(data, f_output, ensure_ascii=ensure_ascii)
 
@@ -166,24 +169,13 @@ def summary(self, raw):
     def artifacts(self, raw):
         return []
 
-    def report(self, full_report, ensure_ascii=False):
+    def report(self, output, ensure_ascii=False):
         """Returns a json dict via stdout.
 
-        :param full_report: Analyzer results as dict.
+        :param output: worker output.
         :param ensure_ascii: Force ascii output. Default: False"""
 
-        summary = {}
-        try:
-            summary = self.summary(full_report)
-        except Exception:
-            pass
-
-        self.__write_output({
-            'success': True,
-            'summary': summary,
-            'artifacts': self.artifacts(full_report),
-            'full': full_report
-        }, ensure_ascii=ensure_ascii)
+        self.__write_output(output, ensure_ascii=ensure_ascii)
 
     def run(self):
         """Overwritten by analyzers"""