Merge pull request #98 from detiber/python2Compat

Improve python2 backward compat for ResponseError

Author: displague

packet/baseapi.py

@@ -27,7 +27,9 @@ def __init__(self, resp, data, exception=None):
             msg = data["error"]
         elif "errors" in data:
             msg = ", ".join(data["errors"])
-        super().__init__("Error {0}: {1}".format(resp.status_code, msg), exception)
+        super(ResponseError, self).__init__(
+            "Error {0}: {1}".format(resp.status_code, msg), exception
+        )
         self._response = resp
 
     @property

setup.py

@@ -7,26 +7,30 @@
     from setuptools import setup
 except ImportError:
     from ez_setup import use_setuptools
+
     use_setuptools()
     from setuptools import setup
 
 
 with open("README.md") as readme, open("CHANGELOG.md") as changelog:
     long_description = readme.read() + "\n" + changelog.read()
 
+
 def read(rel_path):
     here = os.path.abspath(os.path.dirname(__file__))
-    with codecs.open(os.path.join(here, rel_path), 'r') as fp:
+    with codecs.open(os.path.join(here, rel_path), "r") as fp:
         return fp.read()
 
+
 def get_version(rel_path):
     for line in read(rel_path).splitlines():
-        if line.startswith('__version__'):
+        if line.startswith("__version__"):
             delim = '"' if '"' in line else "'"
             return line.split(delim)[1]
     else:
         raise RuntimeError("Unable to find version string.")
 
+
 setup(
     name="packet-python",
     version=get_version("packet/__init__.py"),

test/test_baseapi.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# SPDX-License-Identifier: LGPL-3.0-only
+
+import sys
+import unittest
+
+import packet
+
+
+class obj(object):
+    def __init__(self, dict_):
+        self.__dict__.update(dict_)
+
+
+class ErrorTest(unittest.TestCase):
+    def test_cause(self):
+        msg = "boom"
+        cause = "cause"
+        error = packet.Error(msg, cause)
+        self.assertIn(error.cause, cause)
+
+
+class ResponseErrorTest(unittest.TestCase):
+    def setUp(self):
+        self.resp500 = obj({"status_code": 500})
+        self.errBoom = {"error": "boom"}
+        self.errBangBoom = {"errors": ["bang", "boom"]}
+        self.exception = Exception("x")
+
+    def test_init_empty(self):
+        error = packet.ResponseError(self.resp500, None, None)
+        self.assertIn("empty", str(error))
+
+    def test_init_error(self):
+        error = packet.ResponseError(self.resp500, self.errBoom, self.exception)
+        self.assertIn("Error 500: boom", str(error))
+        self.assertEqual(500, error.response.status_code)
+        self.assertEqual(self.exception, error.cause)
+
+    def test_init_errors(self):
+        error = packet.ResponseError(self.resp500, self.errBangBoom, self.exception)
+        self.assertIn("Error 500: bang, boom", str(error))
+        self.assertEqual(500, error.response.status_code)
+        self.assertEqual(self.exception, error.cause)
+
+
+if __name__ == "__main__":
+    sys.exit(unittest.main())