From 5ec9c14937f0cc1580584e953a3da138ab9011e3 Mon Sep 17 00:00:00 2001
From: decalage2 <decalage@laposte.net>
Date: Fri, 15 Feb 2019 20:34:13 +0100
Subject: [PATCH] olevba: define unicode=str for Python 3 (issue #106)

---
 oletools/olevba.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/oletools/olevba.py b/oletools/olevba.py
index 3c0fd79..d07231b 100644
--- a/oletools/olevba.py
+++ b/oletools/olevba.py
@@ -342,6 +342,8 @@ else:
     xrange = range
     # unichr does not exist anymore, only chr:
     unichr = chr
+    # json2ascii also needs "unicode":
+    unicode = str
     from functools import reduce
     #: Default string encoding for the olevba API
     DEFAULT_API_ENCODING = None  # on Python 3: None (unicode)
@@ -2258,7 +2260,7 @@ def json2ascii(json_obj, encoding='utf8', errors='replace'):
         pass
     elif isinstance(json_obj, (bool, int, float)):
         pass
-    elif isinstance(json_obj, str):
+    elif isinstance(json_obj, bytes):
         # de-code and re-encode
         dencoded = json_obj.decode(encoding, errors).encode(encoding, errors)
         if dencoded != json_obj:
--
libgit2 0.21.4