added tox config and better error handling

derwentx · derwentx · commit 45812f4d0300 · 2018-08-10T16:48:06.000+10:00
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,8 @@ run.py
 run3.py
 *.orig
 .eggs/*
-.cache/v/cache/lastfailed
-pylint_report.txt
+.cache/v/cache/lastfailed
+pylint_report.txt
 .pypirc
+.tox/*
+.pytest_cache/*
diff --git a/tests.py b/tests.py
@@ -1001,15 +1001,15 @@ def test_APIGet(self):
         response_obj = response.json()
         self.assertEqual(response_obj['name'], self.api_params['wp_user'])
 
-class WPAPITestCasesBasic(WPAPITestCasesBase):
-    def setUp(self):
-        super(WPAPITestCasesBasic, self).setUp()
-        self.api_params.update({
-            'user_auth': True,
-            'basic_auth': True,
-            'query_string_auth': False,
-        })
-        self.wpapi = API(**self.api_params)
+# class WPAPITestCasesBasic(WPAPITestCasesBase):
+#     def setUp(self):
+#         super(WPAPITestCasesBasic, self).setUp()
+#         self.api_params.update({
+#             'user_auth': True,
+#             'basic_auth': True,
+#             'query_string_auth': False,
+#         })
+#         self.wpapi = API(**self.api_params)
 
 # class WPAPITestCasesBasicV1(WPAPITestCasesBase):
 #     def setUp(self):
diff --git a/tox.ini b/tox.ini
@@ -0,0 +1,14 @@
+# Tox (https://tox.readthedocs.io/) is a tool for running tests
+# in multiple virtualenvs. This configuration file will run the
+# test suite on all supported python versions. To use it, "pip install tox"
+# and then run "tox" from this directory.
+
+[tox]
+envlist = py27, py36
+
+[testenv]
+deps=
+    -rrequirements.txt
+    -rrequirements-test.txt
+commands=
+    pytest
diff --git a/wordpress/api.py b/wordpress/api.py
@@ -8,6 +8,7 @@
 
 # from requests import request
 import logging
+from six import text_type, u
 from json import dumps as jsonencode
 
 from wordpress.auth import BasicAuth, OAuth, OAuth_3Leg
@@ -164,12 +165,12 @@ def request_post_mortem(self, response=None):
                     header_url = StrUtils.eviscerate(header_url, '/')
                     remedy = "try changing url to %s" % header_url
 
-        msg = "API call to %s returned \nCODE: %s\nRESPONSE:%s \nHEADERS: %s\nREQ_BODY:%s" % (
+        msg = u"API call to %s returned \nCODE: %s\nRESPONSE:%s \nHEADERS: %s\nREQ_BODY:%s" % (
             request_url,
-            str(response.status_code),
+            text_type(response.status_code),
             UrlUtils.beautify_response(response),
-            str(response_headers),
-            str(request_body)[:1000]
+            text_type(response_headers),
+            repr(request_body)[:1000]
         )
         if reason:
             msg += "\nBecause of %s" % reason
