Better py3 support 🔥

Owanesh · Owanesh · commit a7713d065618 · 2018-02-23T12:51:19.000+01:00
- Unicode message in post_mortem (py3)
- Unicode concatenation in post_mortem (py2)
diff --git a/wordpress/api.py b/wordpress/api.py
@@ -3,7 +3,6 @@
 """
 Wordpress API Class
 """
-
 __title__ = "wordpress-api"
 
 # from requests import request
@@ -14,6 +13,11 @@
 from wordpress.helpers import StrUtils, UrlUtils
 from wordpress.transport import API_Requests_Wrapper
 
+try:
+    UNICODE_EXISTS = bool(type(unicode))
+except NameError:
+    unicode = lambda s: str(s)
+
 
 class API(object):
     """ API Class """
@@ -36,7 +40,8 @@ def __init__(self, url, consumer_key, consumer_secret, **kwargs):
             auth_class = OAuth_3Leg
 
         if kwargs.get('version', '').startswith('wc') and kwargs.get('oauth1a_3leg'):
-            self.logger.warn("WooCommerce JSON Api does not seem to support 3leg")
+            self.logger.warn(
+                "WooCommerce JSON Api does not seem to support 3leg")
 
         self.auth = auth_class(**auth_kwargs)
 
@@ -102,17 +107,17 @@ def request_post_mortem(self, response=None):
 
         if 'code' in response_json or 'message' in response_json:
             reason = u" - ".join([
-                unicode(response_json.get(key)) for key in ['code', 'message', 'data'] \
+                unicode(response_json.get(key)) for key in ['code', 'message', 'data']
                 if key in response_json
             ])
 
             if 'code' == 'rest_user_invalid_email':
                 remedy = "Try checking the email %s doesn't already exist" % \
-                request_body.get('email')
+                    request_body.get('email')
 
             elif 'code' == 'json_oauth1_consumer_mismatch':
                 remedy = "Try deleting the cached credentials at %s" % \
-                self.auth.creds_store
+                    self.auth.creds_store
 
             elif 'code' == 'woocommerce_rest_cannot_view':
                 if not self.auth.query_string_auth:
@@ -145,12 +150,13 @@ def request_post_mortem(self, response=None):
                     header_api_url = StrUtils.eviscerate(header_api_url, '/')
 
                 if header_api_url and requester_api_url\
-                and header_api_url != requester_api_url:
+                        and header_api_url != requester_api_url:
                     reason = "hostname mismatch. %s != %s" % (
                         header_api_url, requester_api_url
                     )
                     header_url = StrUtils.eviscerate(header_api_url, '/')
-                    header_url = StrUtils.eviscerate(header_url, self.requester.api)
+                    header_url = StrUtils.eviscerate(
+                        header_url, self.requester.api)
                     header_url = StrUtils.eviscerate(header_url, '/')
                     remedy = "try changing url to %s" % header_url
 
@@ -161,10 +167,12 @@ def request_post_mortem(self, response=None):
             str(response_headers),
             str(request_body)[:1000]
         )
+
         if reason:
-            msg += "\nBecause of %s" % reason
+            msg += "\nBecause of %s" % (str(reason.encode('utf8')))
         if remedy:
-            msg += "\n%s" % remedy
+            msg += "\n%s" % (str(remedy))
+
         raise UserWarning(msg)
 
     def __request(self, method, endpoint, data, **kwargs):
@@ -174,7 +182,8 @@ def __request(self, method, endpoint, data, **kwargs):
         endpoint_url = self.auth.get_auth_url(endpoint_url, method, **kwargs)
         auth = self.auth.get_auth()
 
-        content_type = kwargs.get('headers', {}).get('content-type', 'application/json')
+        content_type = kwargs.get('headers', {}).get(
+            'content-type', 'application/json')
 
         if data is not None and content_type.startswith('application/json'):
             data = jsonencode(data, ensure_ascii=False).encode('utf-8')
