Merge pull request #7 from mtscanlan/fix-recursive-hasattr

1758 : fix recursive hasattr call

Author: aaront

mygeotab/serializers.py

@@ -45,7 +45,11 @@ def object_serializer(obj):
 
     :param obj: The object.
     """
-    return dates.format_iso_datetime(obj) if hasattr(obj, "isoformat") else obj
+    if hasattr(obj, 'isoformat'):
+        return dates.format_iso_datetime(obj)
+    else:
+        # Let the base class default method raise the TypeError
+        return json.JSONEncoder.default(obj)
 
 
 def object_deserializer(obj):

tests/test_serializers.py

@@ -3,6 +3,7 @@
 import json
 from datetime import date, datetime
 
+import pytest
 import pytz
 
 from mygeotab import serializers, dates
@@ -42,6 +43,10 @@ def test_only_date(self):
         data_str = json_serialize(data)
         assert data_str == expected_str
 
+    def test_unparsable_data_throws(self):
+        with pytest.raises(TypeError):
+            json_serialize({''})
+
 
 class TestDeserialization:
     def test_top_level_datetime(self):