Fixed issues with object instance becoming string

Author: frikky

mysql/1.0.0/src/app.py

@@ -52,7 +52,7 @@ def create_database(self, server, user, password, database, name, tables=None):
                 return err
         else:
             if tables:
-                if not isinstance(tables, list) and not isinstance(tables, object) and not isinstance(tables, dict):
+                if not isinstance(tables, list) and not isinstance(tables, dict):
                     tables = json.loads(tables)
 
                 t_count = 0
@@ -86,7 +86,7 @@ def create_database(self, server, user, password, database, name, tables=None):
 
     # Create Tables
     def create_tables(self, server, user, password, database, tables):
-        if not isinstance(tables, list) and not isinstance(tables, object) and not isinstance(tables, dict):
+        if not isinstance(tables, list) and not isinstance(tables, dict):
             tables = json.loads(tables)
 
         try:
@@ -138,7 +138,7 @@ def create_tables(self, server, user, password, database, tables):
 
     # Insert data into table
     def insert_data(self, server, user, password, database, table, data):
-        if not isinstance(data, list) and not isinstance(data, object) and not isinstance(data, dict):
+        if not isinstance(data, list) and not isinstance(data, dict):
             data = json.loads(data)
 
         try:

shuffle-tools/1.2.0/src/app.py

@@ -317,11 +317,11 @@ def set_json_key(self, json_object, key, value):
                     "reason": "Item is valid JSON, but can't handle lists. Use .#"
                 }
 
-        if not isinstance(json_object, object):
-            return {
-                "success": False,
-                "reason": "Item is not valid JSON (2)"
-            }
+        #if not isinstance(json_object, object):
+        #    return {
+        #        "success": False,
+        #        "reason": "Item is not valid JSON (2)"
+        #    }
 
 
         if isinstance(value, str):
@@ -404,7 +404,7 @@ def replace_value(self, input_data, translate_from, translate_to, else_value="")
         return input_data
 
     def replace_value_from_dictionary(self, input_data, mapping, default_value=""):
-        if not isinstance(mapping, dict) and not isinstance(mapping, object):
+        if isinstance(mapping, str):
             try:
                 mapping = json.loads(mapping)
             except json.decoder.JSONDecodeError as e:
@@ -1419,14 +1419,15 @@ def merge_lists(self, list_one, list_two, set_field="", sort_key_list_one="", so
         return list_one
 
     def xml_json_convertor(self, convertto, data):
-        if isinstance(data, dict) or isinstance(data, object) or isinstance(data, list):
+        if isinstance(data, dict) or isinstance(data, list):
             try:
                 data = json.dumps(data)
             except:
                 pass
 
         try:
             if convertto == "json":
+                data = data.replace(" encoding=\"utf-8\"", " ")
                 ans = xmltodict.parse(data)
                 json_data = json.dumps(ans)
                 return json_data
@@ -1448,7 +1449,7 @@ def date_to_epoch(self, input_data, date_field, date_format):
             )
         )
 
-        if not isinstance(input_data, dict) and not isinstance(input_data, object):
+        if isinstance(input_data, str):
             result = json.loads(input_data)
         else:
             result = input_data
@@ -1573,7 +1574,7 @@ def check_cache_contains(self, key, value, append):
             "key": key,
         }
 
-        if isinstance(value, dict) or isinstance(value, list) or isinstance(value, object):
+        if isinstance(value, dict) or isinstance(value, list):
             try:
                 value = json.dumps(value)
             except Exception as e:
@@ -1767,7 +1768,7 @@ def set_cache_value(self, key, value):
         org_id = self.full_execution["workflow"]["execution_org"]["id"]
         url = "%s/api/v1/orgs/%s/set_cache" % (self.url, org_id)
 
-        if isinstance(value, dict) or isinstance(value, list) or isinstance(value, object):
+        if isinstance(value, dict) or isinstance(value, list):
             try:
                 value = json.dumps(value)
             except Exception as e: