Fix Python 3 bytes/str incompatibility in simplejson and postback methods

- sailthru_response.py: use response.text instead of response.content so
  simplejson (which rejects bytes) receives a str; also catch TypeError in
  addition to ValueError for robustness
- sailthru_client.py: remove redundant json.loads() in receive_verify_post
  since get_body() already returns a parsed dict
- sailthru_client.py: fix get_signature_string() returning bytes instead of
  str by moving .encode('utf-8') into get_signature_hash() where hashlib needs it
- test: update receive_verify_post mock to return a dict matching real get_body() behavior
- setup.py: bump version to 2.3.6

Closes INT-1681. Resolves the same issue identified in PR #63 (open since 2017).

Author: vnatakam

sailthru/sailthru_client.py

@@ -31,15 +31,15 @@ def get_signature_string(params, secret):
     """
     str_list = [str(item) for item in extract_params(params)]
     str_list.sort()
-    return (secret + ''.join(str_list)).encode('utf-8')
+    return secret + ''.join(str_list)
 
 def get_signature_hash(params, secret):
     """
     Returns an MD5 hash of the signature string for an API call.
     @param params: dictionary values to generate signature hash
     @param sercret: secret string
     """
-    return hashlib.md5(get_signature_string(params, secret)).hexdigest()
+    return hashlib.md5(get_signature_string(params, secret).encode('utf-8')).hexdigest()
 
 
 class SailthruClient(object):
@@ -589,14 +589,10 @@ def receive_verify_post(self, post_params):
 
         send_response = self.get_send(post_params['send_id'])
 
-        try:
-            send_body = send_response.get_body()
-            send_json = json.loads(send_body)
-            if 'email' not in send_body:
-                return False
-            if send_json['email'] != post_params['email']:
-                return False
-        except ValueError:
+        send_json = send_response.get_body()
+        if not send_json or 'email' not in send_json:
+            return False
+        if send_json['email'] != post_params['email']:
             return False
 
         return True

sailthru/sailthru_response.py

@@ -11,8 +11,8 @@ def __init__(self, response):
         self.json_error = None
 
         try:
-            self.json = json.loads(response.content)
-        except ValueError as e:
+            self.json = json.loads(response.text)
+        except (ValueError, TypeError) as e:
             self.json = None
             self.json_error = str(e)
 

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='sailthru-client', 
-    version='2.3.5',
+    version='2.3.6',
     packages=find_packages(),
     description='Python client for Sailthru API',
     long_description=open('README.md').read(),

test/test_sailthru_client.py

@@ -64,7 +64,7 @@ def test_check_for_valid_actions(self):
 
     def test_receive_verify_post(self):
         mock_http_request = MagicMock()
-        mock_http_request.return_value.get_body.return_value = '{"email":"menglander@sailthru.com"}'
+        mock_http_request.return_value.get_body.return_value = {"email": "menglander@sailthru.com"}
 
         self.client._http_request = mock_http_request