'str' to '(str, bytes)'

Author: obhodny

qencode3/__init__.py

@@ -29,7 +29,7 @@ def x265_video_codec():
 
 from . exeptions import QencodeClientException, QencodeTaskException
 
-__version__ = "0.9.15"
+__version__ = "0.9.17"
 __status__ = "Beta"
 __author__ = "Qencode"
 

qencode3/task.py

@@ -53,7 +53,10 @@ def custom_start(self, data,  **kwargs):
       self._create_task(1)
 
     if not self.error:
-      data = self._prepare_data_custom(self._prepare_query(data), **kwargs)
+      query = self._prepare_query(data)
+
+      if not self.error:
+        data = self._prepare_data_custom(query, **kwargs)
 
     if not self.error and self.task_token:
       self._start_encode('start_encode2', data)
@@ -122,10 +125,18 @@ def _prepare_query(self, params):
       query = rm_key_if_null(params)      
       return json.dumps(query)
 
-    if isinstance(params, str):
+    if isinstance(params, (str, bytes)):
       if is_json(params):
         query = rm_key_if_null(params)
         return query
+      else:
+        self.error = True
+        try:
+          self.message = "JSON is not well formatted: {0} Is not defined".format(params)
+        except Exception as e:
+          pass
+        finally:
+          self.message = "JSON is not well formatted"
 
   def _prepare_data_custom(self, query_json, **kwargs):
     data = dict(

qencode3/utils.py

@@ -29,7 +29,7 @@ def rm_attributes_if_null(class_obj):
 def rm_key_if_null(obj):
   if isinstance(obj, dict):
     return _rm_key(obj)
-  elif isinstance(obj, str):
+  elif isinstance(obj, (str, bytes)):
     res = _rm_key(json.loads(obj))
     return json.dumps(res)
 

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='qencode3',
-    version='0.9.15',
+    version='0.9.17',
     description='Qencode Python SDK',
     url='https://github.com/qencode-dev/qencode-api-python3-client',
     # url=here,