Fix jsonfmt's py3 support

rasa · Mar 3, 2017 · 76aaea7 · 76aaea7
1 parent 47fdbb8
commit 76aaea7
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/jsonfmt.py b/jsonfmt.py
@@ -16,7 +16,7 @@ def decode(s):
     for encoding in 'utf-8-sig', 'utf-16':
         try:
             return s.decode(encoding)
-        except UnicodeDecodeError:
+        except UnicodeDecodeError as e:
             continue
     return s.decode('latin-1')
 
@@ -34,16 +34,18 @@ def touch(filename, mtime):
 mtime = os.path.getmtime(file)
 
 with open(file, 'r') as f:
-    jstr = f.read(os.path.getsize(file))
+    jstr = f.read()
     jstr_no_bom = decode(jstr)
-
+    
 parser = JsonComment(json)
 json_data = parser.loads(jstr_no_bom)
 
 new_data = json.dumps(
     json_data, sort_keys=True, indent=4, separators=(',', ': '))
-with open(file + '.tmp', 'w') as f:
-    f.write(new_data + "\n")
+with open(file + '.tmp', 'wb') as f:
+    new_data = new_data.encode('utf-8')
+    new_data += b"\n"
+    f.write(new_data)
 
 if os.path.isfile(file + '.bak'):
     os.remove(file + '.bak')