directly invoke __setstate__ method for entity instantiation

Author: uwzm

frost_sta_client/utils.py

@@ -19,6 +19,7 @@
 from dateutil.parser import isoparse
 import geojson
 import logging
+import sys
 import frost_sta_client.model.ext.entity_list
 
 
@@ -30,12 +31,14 @@ def transform_entity_to_json_dict(entity):
     json_str = jsonpickle.encode(entity, unpicklable=False)
     return jsonpickle.decode(json_str)
 
+def class_from_string(string):
+    module_name, class_name = string.rsplit(".", 1)
+    return getattr(sys.modules[module_name], class_name)
 
 def transform_json_to_entity(json_response, entity_class):
-    decodable_str = '{\'py/object\': \'' + entity_class + '\', \'py/state\': ' \
-                    + jsonpickle.encode(json_response, unpicklable=False) + '}'
-    return jsonpickle.decode(decodable_str)
-
+    obj = entity_class()
+    obj.__setstate__(json_response)
+    return obj
 
 def transform_json_to_entity_list(json_response, entity_class):
     entity_list = frost_sta_client.model.ext.entity_list.EntityList(entity_class)
@@ -51,9 +54,8 @@ def transform_json_to_entity_list(json_response, entity_class):
         response_list = json_response
     else:
         raise ValueError("expected json as a dict or list to transform into entity list")
-    for item in response_list:
-        result_list.append(transform_json_to_entity(item, entity_list.entity_class))
-    entity_list.entities = result_list
+    ent_cl = class_from_string(entity_list.entity_class)
+    entity_list.entities = [transform_json_to_entity(item, ent_cl) for item in response_list]
     return entity_list