Hardening encoding in post-mortem

derwentx · derwentx · commit 8cc919c57261 · 2018-10-16T09:00:37.000+11:00
diff --git a/wordpress/api.py b/wordpress/api.py
@@ -169,11 +169,16 @@ def request_post_mortem(self, response=None):
                 if header_api_url:
                     header_api_url = StrUtils.eviscerate(header_api_url, '/')
 
-                if header_api_url and requester_api_url\
-                        and header_api_url != requester_api_url:
-                    reason = "hostname mismatch. %s != %s" % (
-                        header_api_url, requester_api_url
-                    )
+                if (
+                    header_api_url and requester_api_url
+                    and StrUtils.to_text(header_api_url)
+                    != StrUtils.to_text(requester_api_url)
+                ):
+                    reason = "hostname mismatch. %s != %s" % tuple(map(
+                        StrUtils.to_text, [
+                            header_api_url, requester_api_url
+                        ]
+                    ))
                     header_url = StrUtils.eviscerate(header_api_url, '/')
                     header_url = StrUtils.eviscerate(
                         header_url, self.requester.api)
@@ -188,7 +193,7 @@ def request_post_mortem(self, response=None):
             response.status_code,
             UrlUtils.beautify_response(response),
             response_headers,
-            request_body[:1000]
+            StrUtils.to_binary(request_body)[:1000]
         ]))
         if reason:
             msg += "\nBecause of %s" % StrUtils.to_binary(reason)
