Add bytearray type to make a difference between filename and image bytes in Python 2 (#45)

Author: Denis-Averin

aspose_barcode_cloud/api_client.py

@@ -69,7 +69,7 @@ class ApiClient(object):
         to the API
     """
 
-    PRIMITIVE_TYPES = (float, bool, bytes, six.text_type) + six.integer_types
+    PRIMITIVE_TYPES = (float, bool, bytes, bytearray, six.text_type) + six.integer_types
     NATIVE_TYPES_MAPPING = {
         "int": int,
         "long": int if six.PY3 else long,  # noqa: F821
@@ -207,7 +207,7 @@ def __call_api(
         if _return_http_data_only:
             return return_data
         else:
-            return (return_data, response_data.status, response_data.getheaders())
+            return return_data, response_data.status, response_data.getheaders()
 
     def sanitize_for_serialization(self, obj):
         """Builds a JSON POST object.
@@ -285,7 +285,7 @@ def __deserialize(self, data, klass):
 
         if type(klass) == str:
             if klass.startswith("list["):
-                sub_kls = re.match(r"list\[(.*)\]", klass).group(1)
+                sub_kls = re.match(r"list\[(.*)]", klass).group(1)
                 return [self.__deserialize(sub_data, sub_kls) for sub_data in data]
 
             if klass.startswith("dict("):
@@ -338,13 +338,13 @@ def call_api(
         :param header_params: Header parameters to be
             placed in the request header.
         :param body: Request body.
-        :param post_params dict: Request post form parameters,
+        :param post_params: dict: Request post form parameters,
             for 'application/x-www-form-urlencoded', 'multipart/form-data'.
-        :param auth_settings list: Auth Settings names for the request.
-        :param response: Response data type.
-        :param files dict: key -> filename, value -> filepath,
+        :param response_type: Response data type.
+        :param auth_settings: list: Auth Settings names for the request.
+        :param files: dict: key -> filename, value -> filepath,
             for 'multipart/form-data'.
-        :param async_req bool: execute request asynchronously
+        :param async_req: bool: execute request asynchronously
         :param _return_http_data_only: response data without head status code
                                        and headers
         :param collection_formats: dict of collection formats for path, query,
@@ -511,24 +511,21 @@ def parameters_to_tuples(self, params, collection_formats):
                 new_params.append((k, v))
         return new_params
 
-    def is_not_ascii(self, string):
-        return any(ord(c) >= 128 for c in string)
-
     def prepare_one_file(self, file_data):
         # type: (Union[bytes, str, file, pathlib.Path, io.BytesIO]) -> FileFieldData # noqa: F821
 
-        # Python 2 has no difference between Bytes and Str
-        # So decide non-ascii string is Bytes
-        if isinstance(file_data, bytes) and (not six.PY2 or self.is_not_ascii(file_data)):
-            return FileFieldData("data.bin", file_data, "application/octet-stream")
-
         if isinstance(file_data, str) or (not six.PY2 and isinstance(file_data, pathlib.PurePath)):
             with open(file_data, "rb") as f:
                 fname = os.path.basename(f.name)
                 file_bytes = f.read()
             mime_type = mimetypes.guess_type(fname)[0] or "application/octet-stream"
             return FileFieldData(fname, file_bytes, mime_type)
 
+        # Python 2 has no difference between bytes and str
+        # Use bytearray in Python 2 to make a difference with str
+        if isinstance(file_data, bytes) or isinstance(file_data, bytearray):
+            return FileFieldData("data.bin", file_data, "application/octet-stream")
+
         if isinstance(file_data, io.BytesIO):
             return FileFieldData("data.bin", file_data.read(), "application/octet-stream")
 
@@ -687,8 +684,8 @@ def __deserialize_datetime(self, string):
         except ValueError:
             raise ApiException(reason=("Failed to parse '{0}' as datetime object".format(string)))
 
-    def __hasattr(self, object, name):
-        return name in object.__class__.__dict__
+    def __hasattr(self, obj, name):
+        return name in obj.__class__.__dict__
 
     def __deserialize_model(self, data, klass):
         """Deserializes list or dict to model.

aspose_barcode_cloud/rest.py

@@ -47,7 +47,9 @@
 
 
 class RESTResponse(io.IOBase):
-    def __init__(self, resp):
+    def __init__(self, resp, *args, **kwargs):
+        super(RESTResponse, self).__init__(*args, **kwargs)
+
         self.urllib3_response = resp
         self.status = resp.status
         self.reason = resp.reason
@@ -219,8 +221,8 @@ def _request(
                         headers=headers,
                     )
                 elif headers["Content-Type"] == "application/octet-stream":
-                    file = post_params.pop(-1)
-                    body = file[1][1]
+                    file_data = post_params.pop(-1)
+                    body = file_data[1][1]
                     r = self.pool_manager.request(
                         method, url, body=body, preload_content=_preload_content, timeout=timeout, headers=headers
                     )
@@ -255,6 +257,7 @@ def _request(
 
         return r
 
+    # noinspection PyPep8Naming
     def GET(self, url, headers=None, query_params=None, _preload_content=True, _request_timeout=None):
         return self._request(
             "GET",
@@ -265,6 +268,7 @@ def GET(self, url, headers=None, query_params=None, _preload_content=True, _requ
             query_params=query_params,
         )
 
+    # noinspection PyPep8Naming
     def HEAD(self, url, headers=None, query_params=None, _preload_content=True, _request_timeout=None):
         return self._request(
             "HEAD",
@@ -275,6 +279,7 @@ def HEAD(self, url, headers=None, query_params=None, _preload_content=True, _req
             query_params=query_params,
         )
 
+    # noinspection PyPep8Naming
     def OPTIONS(
         self,
         url,
@@ -296,6 +301,7 @@ def OPTIONS(
             body=body,
         )
 
+    # noinspection PyPep8Naming
     def DELETE(self, url, headers=None, query_params=None, body=None, _preload_content=True, _request_timeout=None):
         return self._request(
             "DELETE",
@@ -307,6 +313,7 @@ def DELETE(self, url, headers=None, query_params=None, body=None, _preload_conte
             body=body,
         )
 
+    # noinspection PyPep8Naming
     def POST(
         self,
         url,
@@ -328,6 +335,7 @@ def POST(
             body=body,
         )
 
+    # noinspection PyPep8Naming
     def PUT(
         self,
         url,
@@ -349,6 +357,7 @@ def PUT(
             body=body,
         )
 
+    # noinspection PyPep8Naming
     def PATCH(
         self,
         url,

tests/test_recognize_bytes.py

@@ -2,6 +2,8 @@
 import os
 import unittest
 
+import six
+
 from aspose_barcode_cloud import PresetType, ApiClient, BarcodeApi, DecodeBarcodeType
 from .load_configuration import TEST_CONFIGURATION
 
@@ -15,6 +17,7 @@ def setUpClass(cls):
 
         cls.api = BarcodeApi(api_client=ApiClient(configuration=TEST_CONFIGURATION))
 
+    @unittest.skipIf(six.PY2, "Python 2 has no difference between bytes and str")
     def test_post_barcode_recognize_from_url_or_content_bytes(self):
         """Test case for post_barcode_recognize_from_url_or_content
 
@@ -33,6 +36,24 @@ def test_post_barcode_recognize_from_url_or_content_bytes(self):
         self.assertEqual(DecodeBarcodeType.PDF417, barcode.type)
         self.assertEqual("Aspose.BarCode for Cloud Sample", barcode.barcode_value)
 
+    def test_post_barcode_recognize_from_url_or_content_bytearray(self):
+        """Test case for post_barcode_recognize_from_url_or_content
+
+        Recognize barcode from bytes.
+        """
+        with open(self.test_filename, "rb") as f:
+            image_bytes = bytearray(f.read())
+
+        response = self.api.post_barcode_recognize_from_url_or_content(
+            preset=PresetType.HIGHPERFORMANCE,
+            image=image_bytes,
+        )
+
+        self.assertEqual(1, len(response.barcodes))
+        barcode = response.barcodes[0]
+        self.assertEqual(DecodeBarcodeType.PDF417, barcode.type)
+        self.assertEqual("Aspose.BarCode for Cloud Sample", barcode.barcode_value)
+
     def test_post_barcode_recognize_from_url_or_content_BytesIO(self):
         """Test case for post_barcode_recognize_from_url_or_content
 

tests/test_recognize_file.py

@@ -1,8 +1,8 @@
 import os
 import sys
+import unittest
 
 import six
-import unittest
 
 from aspose_barcode_cloud import PresetType, ApiClient, BarcodeApi, DecodeBarcodeType
 from .load_configuration import TEST_CONFIGURATION