Merge pull request #64 from bradmwilliams/python3-encoding-decoding-fix

Fixing python3 porting issue (json.dumps - encoding) and adding unit …

Author: bradmwilliams

ansible/rebuild_module.digest

@@ -1 +1 @@
-b83aa8bbbe8013e359486160af686bbf  -
+5eb4a318eecb23a689b2ce1239f9f2d9  -

ansible/roles/openshift_client_python/library/openshift_client_python.py

@@ -116,7 +116,7 @@ def as_json(self, indent=4):
         """
         :return: Returns a JSON presentation of the APIObject.
         """
-        return json.dumps(self.model._primitive(), indent=indent, encoding='utf-8').strip().decode('utf-8')
+        return json.dumps(self.model._primitive(), indent=indent).strip()
 
     def kind(self, lowercase=True, if_missing=_DEFAULT):
         """

packages/openshift/apiobject.py

@@ -0,0 +1,17 @@
+import unittest
+
+from .apiobject import APIObject
+
+
+class TestModel(unittest.TestCase):
+
+    def test_empty(self):
+        obj = APIObject()
+        self.assertIs(len(obj.model), 0)
+        self.assertEqual(obj.as_dict(), {})
+        self.assertEqual(obj.as_json(), '{}')
+        self.assertIsNone(obj.context.project_name)
+
+
+if __name__ == '__main__':
+    unittest.main()

packages/openshift/test_apiobject.py

@@ -2,4 +2,5 @@
 
 export PYTHONPATH="$(pwd)/packages"
 cd $(pwd)/packages
-python -m unittest discover
+python2 -m unittest discover
+python3 -m unittest discover