support more encoding types

derwentx · derwentx · commit 04c403ffe3ec · 2018-10-18T07:34:03.000+11:00
diff --git a/wordpress/helpers.py b/wordpress/helpers.py
@@ -7,6 +7,8 @@
 __title__ = "wordpress-requests"
 
 import json
+import locale
+import os
 import posixpath
 import re
 import sys
@@ -65,15 +67,14 @@ def to_binary(cls, string, encoding='utf8', errors='backslashreplace'):
 
     @classmethod
     def jsonencode(cls, data, **kwargs):
-        # kwargs['cls'] = BytesJsonEncoder
-        # if PY2:
-        #     kwargs['encoding'] = 'utf8'
         if PY2:
-            for encoding in [
+            for encoding in filter(None, {
                 kwargs.get('encoding', 'utf8'),
                 sys.getdefaultencoding(),
+                sys.getfilesystemencoding(),
+                locale.getpreferredencoding(),
                 'utf8',
-            ]:
+            }):
                 try:
                     kwargs['encoding'] = encoding
                     return json.dumps(data, **kwargs)
