* Fixes encoding issue when JSON is serialized.

* Simplifies travis flow, adds requirements file.

Author: max-inanc

.gitignore

@@ -61,4 +61,4 @@ target/
 .idea/
 
 # pyvenv
-venv/
+venv*/

.travis.yml

@@ -7,11 +7,7 @@ python:
   - '3.6'
   - 'nightly'
 install:
-  - pip install mock==2.0
-  - pip install requests
-  - pip install codecov
-  - pip install pytest pytest-cov
-  - pip install pycodestyle
+  - pip install -r requirements.txt
   - pip install .
 script:
   - coverage run --source=messagebird -m unittest discover -s tests/

messagebird/http_client.py

@@ -33,7 +33,7 @@ def request(self, path, method='GET', params=None, format=ResponseFormat.text):
             'Accept': 'application/json',
             'Authorization': 'AccessKey ' + self.access_key,
             'User-Agent': self.user_agent,
-            'Content-Type': 'application/json'
+            'Content-Type': 'application/json; charset=UTF-8'
         }
 
         method_switcher = {

messagebird/serde.py

@@ -1,8 +1,15 @@
 import json
+import sys
 
 
 def json_serialize(obj):
-    try:
-        return json.dumps(obj)
-    except TypeError:
-        return json.dumps(obj, default=lambda o: o.__dict__)
+    if sys.version_info > (3, 0):
+        try:
+            return json.dumps(obj, ensure_ascii=False).encode('utf-8')
+        except TypeError:
+            return json.dumps(obj, default=lambda o: o.__dict__, ensure_ascii=False).encode('utf-8')
+    else:
+        try:
+            return json.dumps(obj, ensure_ascii=False, encoding='utf-8')
+        except TypeError:
+            return json.dumps(obj, default=lambda o: o.__dict__, ensure_ascii=False, encoding='utf-8')

requirements.txt

@@ -0,0 +1,7 @@
+mock==2.0.0
+requests==2.24.0
+coverage==5.2.1
+pytest==4.6.11
+pytest-cov==2.10.1
+pycodestyle==2.6.0
+enum==0.4.7

tests/test_serde.py

@@ -0,0 +1,23 @@
+# coding=utf-8
+import sys
+import unittest
+
+from messagebird.serde import json_serialize
+
+
+class TestJSONSerDe(unittest.TestCase):
+
+    @staticmethod
+    def encode_if_py3(s):
+        if sys.version_info > (3, 0):
+            return s.encode('utf-8')
+        else:
+            return s
+
+    def test_tr_check(self):
+        self.assertEqual(json_serialize({'body': 'Pijamalı hasta, yağız şoföre çabucak güvendi.'}),
+                         self.encode_if_py3("""{"body": "Pijamalı hasta, yağız şoföre çabucak güvendi."}"""))
+
+    def test_jp_check(self):
+        self.assertEqual(json_serialize({'body': 'いろはにほへとちりぬるを'}),
+                         self.encode_if_py3("""{"body": "いろはにほへとちりぬるを"}"""))