From 4ee4db16fe60ae81349488401f296fbf0a06cec4 Mon Sep 17 00:00:00 2001
From: DocArmoryTech <docarmorytech@gmail.com>
Date: Mon, 6 Apr 2020 10:46:15 +0100
Subject: [PATCH 1/3] Fixed __query_virustotal return type

__query_virustotal returned a Response object and not the json expected; modified so that report_json is returned instead of report.
---
 pymisp/tools/vtreportobject.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pymisp/tools/vtreportobject.py b/pymisp/tools/vtreportobject.py
index 336225e..97c3332 100644
--- a/pymisp/tools/vtreportobject.py
+++ b/pymisp/tools/vtreportobject.py
@@ -81,7 +81,7 @@ class VTReportObject(AbstractMISPObjectGenerator):
             report = requests.get(url, params=params)
         report_json = report.json()
         if report_json["response_code"] == 1:
-            return report
+            return report_json
         else:
             error_msg = "{}: {}".format(resource, report_json["verbose_msg"])
             raise InvalidMISPObject(error_msg)

From c77603eb30879aa000d745277483d9eccd15d789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <Rafiot@users.noreply.github.com>
Date: Fri, 17 Apr 2020 13:01:11 +0200
Subject: [PATCH 2/3] Update up.py

Fix #563
---
 examples/up.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/up.py b/examples/up.py
index af53e02..31088ee 100755
--- a/examples/up.py
+++ b/examples/up.py
@@ -18,4 +18,4 @@ if __name__ == '__main__':
     me = MISPEvent()
     me.load_file(args.input)
 
-    result = misp.update_event(args.event, me)
+    result = misp.update_event(me, args.event)

From f965e579d7303c9976b59ac5efa2c897c0ba6398 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Fri, 24 Apr 2020 11:33:32 +0200
Subject: [PATCH 3/3] fix: [abstract] Forces file to be read with utf8 encoding

---
 pymisp/abstract.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pymisp/abstract.py b/pymisp/abstract.py
index 5df5ffd..dedb635 100644
--- a/pymisp/abstract.py
+++ b/pymisp/abstract.py
@@ -46,7 +46,7 @@ class MISPFileCache(object):
     def _load_json(path: Path) -> Union[dict, None]:
         if not path.exists():
             return None
-        with path.open('r') as f:
+        with path.open('r', encoding='utf-8') as f:
             if HAS_RAPIDJSON:
                 data = load(f)
             else: