diff --git a/README.md b/README.md index be35128..47cc14c 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ [Aspose.BarCode for Cloud](https://products.aspose.cloud/barcode/) is a REST API for Linear, 2D and postal barcode generation and recognition in the cloud. API recognizes and generates barcode images in a variety of formats. Barcode REST API allows to specify barcode image attributes like image width, height, border style and output image format in order to customize the generation process. Developers can also specify the barcode type and text attributes such as text location and font styles in order to suit the application requirements. -This repository contains Aspose.BarCode Cloud SDK for Python source code. This SDK allows you to work with Aspose.BarCode for Cloud REST APIs in your Python 2 or Python 3 applications quickly and easily. +This repository contains Aspose.BarCode Cloud SDK for Python source code. This SDK allows you to work with Aspose.BarCode for Cloud REST APIs in your Python 3 applications quickly and easily. Supported Python versions: @@ -90,7 +90,6 @@ pprint(response) ## Requirements -- six >= 1.10 - urllib3 >= 1.21.1, <2.0 ## Licensing diff --git a/aspose_barcode_cloud/api/barcode_api.py b/aspose_barcode_cloud/api/barcode_api.py index ca7ce25..5c1c6d4 100644 --- a/aspose_barcode_cloud/api/barcode_api.py +++ b/aspose_barcode_cloud/api/barcode_api.py @@ -5,9 +5,6 @@ import re # noqa: F401 import warnings # noqa: F401 -# python 2 and python 3 compatibility library -import six - from aspose_barcode_cloud.api_client import ApiClient @@ -254,7 +251,7 @@ def get_barcode_generate_with_http_info(self, type, text, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method get_barcode_generate" % key) if val is None: @@ -627,7 +624,7 @@ def get_barcode_recognize_with_http_info(self, name, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method get_barcode_recognize" % key) if val is None: @@ -999,7 +996,7 @@ def post_barcode_recognize_from_url_or_content_with_http_info(self, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError( "Got an unexpected keyword argument '%s'" @@ -1175,7 +1172,7 @@ def post_generate_multiple_with_http_info(self, generator_params_list, **kwargs) all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method post_generate_multiple" % key) if val is None: @@ -1483,7 +1480,7 @@ def put_barcode_generate_file_with_http_info(self, name, type, text, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method put_barcode_generate_file" % key) if val is None: @@ -1673,7 +1670,7 @@ def put_barcode_recognize_from_body_with_http_info(self, name, reader_params, ** all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError( "Got an unexpected keyword argument '%s'" " to method put_barcode_recognize_from_body" % key @@ -1794,7 +1791,7 @@ def put_generate_multiple_with_http_info(self, name, generator_params_list, **kw all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method put_generate_multiple" % key) if val is None: @@ -1906,7 +1903,7 @@ def scan_barcode_with_http_info(self, image_file, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method scan_barcode" % key) if val is None: diff --git a/aspose_barcode_cloud/api/file_api.py b/aspose_barcode_cloud/api/file_api.py index 933b1a8..aaeeb07 100644 --- a/aspose_barcode_cloud/api/file_api.py +++ b/aspose_barcode_cloud/api/file_api.py @@ -5,9 +5,6 @@ import re # noqa: F401 import warnings # noqa: F401 -# python 2 and python 3 compatibility library -import six - from aspose_barcode_cloud.api_client import ApiClient @@ -93,7 +90,7 @@ def copy_file_with_http_info(self, src_path, dest_path, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method copy_file" % key) if val is None: @@ -201,7 +198,7 @@ def delete_file_with_http_info(self, path, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method delete_file" % key) if val is None: @@ -302,7 +299,7 @@ def download_file_with_http_info(self, path, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method download_file" % key) if val is None: @@ -429,7 +426,7 @@ def move_file_with_http_info(self, src_path, dest_path, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method move_file" % key) if val is None: @@ -538,7 +535,7 @@ def upload_file_with_http_info(self, path, file, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method upload_file" % key) if val is None: diff --git a/aspose_barcode_cloud/api/folder_api.py b/aspose_barcode_cloud/api/folder_api.py index dc53b68..2e88d0f 100644 --- a/aspose_barcode_cloud/api/folder_api.py +++ b/aspose_barcode_cloud/api/folder_api.py @@ -5,9 +5,6 @@ import re # noqa: F401 import warnings # noqa: F401 -# python 2 and python 3 compatibility library -import six - from aspose_barcode_cloud.api_client import ApiClient @@ -75,7 +72,7 @@ def copy_folder_with_http_info(self, src_path, dest_path, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method copy_folder" % key) if val is None: @@ -180,7 +177,7 @@ def create_folder_with_http_info(self, path, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method create_folder" % key) if val is None: @@ -279,7 +276,7 @@ def delete_folder_with_http_info(self, path, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method delete_folder" % key) if val is None: @@ -379,7 +376,7 @@ def get_files_list_with_http_info(self, path, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method get_files_list" % key) if val is None: @@ -486,7 +483,7 @@ def move_folder_with_http_info(self, src_path, dest_path, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method move_folder" % key) if val is None: diff --git a/aspose_barcode_cloud/api/storage_api.py b/aspose_barcode_cloud/api/storage_api.py index 6b4cb7c..7a51a71 100644 --- a/aspose_barcode_cloud/api/storage_api.py +++ b/aspose_barcode_cloud/api/storage_api.py @@ -5,9 +5,6 @@ import re # noqa: F401 import warnings # noqa: F401 -# python 2 and python 3 compatibility library -import six - from aspose_barcode_cloud.api_client import ApiClient @@ -64,7 +61,7 @@ def get_disc_usage_with_http_info(self, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method get_disc_usage" % key) if val is None: @@ -157,7 +154,7 @@ def get_file_versions_with_http_info(self, path, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method get_file_versions" % key) if val is None: @@ -256,7 +253,7 @@ def object_exists_with_http_info(self, path, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method object_exists" % key) if val is None: @@ -355,7 +352,7 @@ def storage_exists_with_http_info(self, storage_name, **kwargs): all_params.add("_request_timeout") params = locals() - for key, val in six.iteritems(params["kwargs"]): + for key, val in params["kwargs"].items(): if key not in all_params: raise TypeError("Got an unexpected keyword argument '%s'" " to method storage_exists" % key) if val is None: diff --git a/aspose_barcode_cloud/api_client.py b/aspose_barcode_cloud/api_client.py index aa6606a..c600bce 100644 --- a/aspose_barcode_cloud/api_client.py +++ b/aspose_barcode_cloud/api_client.py @@ -6,18 +6,13 @@ import io import json import mimetypes +import pathlib from collections import namedtuple from multiprocessing.pool import ThreadPool import os import re import tempfile - -# python 2 and python 3 compatibility library -import six -from six.moves.urllib.parse import quote - -if not six.PY2: - import pathlib +import urllib.parse from aspose_barcode_cloud.configuration import Configuration import aspose_barcode_cloud.models @@ -45,10 +40,10 @@ class ApiClient(object): to the API """ - PRIMITIVE_TYPES = (float, bool, bytes, bytearray, six.text_type) + six.integer_types + PRIMITIVE_TYPES = (int, float, str, bool, bytes, bytearray) NATIVE_TYPES_MAPPING = { "int": int, - "long": int if six.PY3 else long, # noqa: F821 + "long": int, "float": float, "str": str, "bool": bool, @@ -134,7 +129,9 @@ def __call_api( path_params = self.parameters_to_tuples(path_params, collection_formats) for k, v in path_params: # specified safe chars, encode everything - resource_path = resource_path.replace("{%s}" % k, quote(str(v), safe=config.safe_chars_for_path_param)) + resource_path = resource_path.replace( + "{%s}" % k, urllib.parse.quote(str(v), safe=config.safe_chars_for_path_param) + ) # query parameters if query_params: @@ -219,11 +216,11 @@ def sanitize_for_serialization(self, obj): # model definition for request. obj_dict = { obj.attribute_map[attr]: getattr(obj, attr) - for attr, _ in six.iteritems(obj.swagger_types) + for attr in obj.swagger_types if getattr(obj, attr) is not None } - return {key: self.sanitize_for_serialization(val) for key, val in six.iteritems(obj_dict)} + return {key: self.sanitize_for_serialization(val) for key, val in obj_dict.items()} def deserialize(self, response, response_type): """Deserializes response into an object. @@ -265,7 +262,7 @@ def __deserialize(self, data, klass): if klass.startswith("dict("): sub_kls = re.match(r"dict\(([^,]*), (.*)\)", klass).group(2) - return {k: self.__deserialize(v, sub_kls) for k, v in six.iteritems(data)} + return {k: self.__deserialize(v, sub_kls) for k, v in data.items()} # convert str to class if klass in self.NATIVE_TYPES_MAPPING: @@ -467,7 +464,7 @@ def parameters_to_tuples(self, params, collection_formats): new_params = [] if collection_formats is None: collection_formats = {} - for k, v in six.iteritems(params) if isinstance(params, dict) else params: + for k, v in params.items() if isinstance(params, dict) else params: if k in collection_formats: collection_format = collection_formats[k] if collection_format == "multi": @@ -489,22 +486,20 @@ def parameters_to_tuples(self, params, collection_formats): def prepare_one_file(self, file_data): # type: (Union[bytes, str, file, pathlib.Path, io.BytesIO]) -> FileFieldData # noqa: F821 - if isinstance(file_data, str) or (not six.PY2 and isinstance(file_data, pathlib.PurePath)): + if isinstance(file_data, str) or 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") - if isinstance(file_data, io.BufferedReader) or (six.PY2 and isinstance(file_data, file)): # noqa: F821 + if isinstance(file_data, io.BufferedReader): return FileFieldData(os.path.basename(file_data.name), file_data.read(), "application/octet-stream") raise ApiException(reason="Unknown type {type_name} for file parameter".format(type_name=type(file_data))) @@ -519,7 +514,7 @@ def prepare_post_parameters(self, post_params=None, files=None): params = post_params or [] if files: - for field_name, data in six.iteritems(files): + for field_name, data in files.items(): if not data: continue file_names = data if type(data) is list else [data] @@ -616,7 +611,7 @@ def __deserialize_primitive(self, data, klass): try: return klass(data) except UnicodeEncodeError: - return six.text_type(data) + return str(data) except TypeError: return data @@ -675,7 +670,7 @@ def __deserialize_model(self, data, klass): kwargs = {} if klass.swagger_types is not None: - for attr, attr_type in six.iteritems(klass.swagger_types): + for attr, attr_type in klass.swagger_types.items(): key = klass.attribute_map[attr] # Convert from PascalCase to camelCase # Because server uses camelCase JSON diff --git a/aspose_barcode_cloud/configuration.py b/aspose_barcode_cloud/configuration.py index c1deb0e..95a0fc3 100644 --- a/aspose_barcode_cloud/configuration.py +++ b/aspose_barcode_cloud/configuration.py @@ -9,9 +9,7 @@ import multiprocessing import sys import urllib3 - -import six -from six.moves import http_client as httplib +import http.client from aspose_barcode_cloud.rest import RESTClientObject @@ -35,7 +33,7 @@ def __init__( ): """Constructor""" if self._default: - for key in self._default.__dict__.keys(): + for key in self._default.__dict__: self.__dict__[key] = copy.copy(self._default.__dict__[key]) return @@ -150,7 +148,7 @@ def logger_file(self, value): # then add file handler and remove stream handler. self.logger_file_handler = logging.FileHandler(self.__logger_file) self.logger_file_handler.setFormatter(self.logger_formatter) - for _, logger in six.iteritems(self.logger): + for logger in self.logger.values(): logger.addHandler(self.logger_file_handler) if self.logger_stream_handler: logger.removeHandler(self.logger_stream_handler) @@ -159,7 +157,7 @@ def logger_file(self, value): # then add stream handler and remove file handler. self.logger_stream_handler = logging.StreamHandler() self.logger_stream_handler.setFormatter(self.logger_formatter) - for _, logger in six.iteritems(self.logger): + for logger in self.logger.values(): logger.addHandler(self.logger_stream_handler) if self.logger_file_handler: logger.removeHandler(self.logger_file_handler) @@ -183,17 +181,17 @@ def debug(self, value): self.__debug = value if self.__debug: # if debug status is True, turn on debug logging - for _, logger in six.iteritems(self.logger): + for logger in self.logger.values(): logger.setLevel(logging.DEBUG) - # turn on httplib debug - httplib.HTTPConnection.debuglevel = 1 + # turn on http.client debug + http.client.HTTPConnection.debuglevel = 1 else: # if debug status is False, turn off debug logging, # setting log level to default `logging.WARNING` - for _, logger in six.iteritems(self.logger): + for logger in self.logger.values(): logger.setLevel(logging.WARNING) - # turn off httplib debug - httplib.HTTPConnection.debuglevel = 0 + # turn off http.client debug + http.client.HTTPConnection.debuglevel = 0 @property def logger_format(self): diff --git a/aspose_barcode_cloud/models/api_error.py b/aspose_barcode_cloud/models/api_error.py index 92fd1a4..d1a4b8d 100644 --- a/aspose_barcode_cloud/models/api_error.py +++ b/aspose_barcode_cloud/models/api_error.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class ApiError(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -166,7 +164,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/api_error_response.py b/aspose_barcode_cloud/models/api_error_response.py index 1dc2e7f..e878c03 100644 --- a/aspose_barcode_cloud/models/api_error_response.py +++ b/aspose_barcode_cloud/models/api_error_response.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class ApiErrorResponse(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -82,7 +80,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/australian_post_params.py b/aspose_barcode_cloud/models/australian_post_params.py index 721778b..caaa478 100644 --- a/aspose_barcode_cloud/models/australian_post_params.py +++ b/aspose_barcode_cloud/models/australian_post_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class AustralianPostParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -86,7 +84,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/auto_size_mode.py b/aspose_barcode_cloud/models/auto_size_mode.py index c41f2a8..e0697db 100644 --- a/aspose_barcode_cloud/models/auto_size_mode.py +++ b/aspose_barcode_cloud/models/auto_size_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class AutoSizeMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/available_graphics_unit.py b/aspose_barcode_cloud/models/available_graphics_unit.py index ebf0ead..c63886d 100644 --- a/aspose_barcode_cloud/models/available_graphics_unit.py +++ b/aspose_barcode_cloud/models/available_graphics_unit.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class AvailableGraphicsUnit(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -40,7 +38,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/aztec_encode_mode.py b/aspose_barcode_cloud/models/aztec_encode_mode.py index 41fab9f..dc60cfc 100644 --- a/aspose_barcode_cloud/models/aztec_encode_mode.py +++ b/aspose_barcode_cloud/models/aztec_encode_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class AztecEncodeMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/aztec_params.py b/aspose_barcode_cloud/models/aztec_params.py index 5475ded..a05620d 100644 --- a/aspose_barcode_cloud/models/aztec_params.py +++ b/aspose_barcode_cloud/models/aztec_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class AztecParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -274,7 +272,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/aztec_symbol_mode.py b/aspose_barcode_cloud/models/aztec_symbol_mode.py index dfed66a..41b1e8b 100644 --- a/aspose_barcode_cloud/models/aztec_symbol_mode.py +++ b/aspose_barcode_cloud/models/aztec_symbol_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class AztecSymbolMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -40,7 +38,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/barcode_response.py b/aspose_barcode_cloud/models/barcode_response.py index f3ab738..bcdcc60 100644 --- a/aspose_barcode_cloud/models/barcode_response.py +++ b/aspose_barcode_cloud/models/barcode_response.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class BarcodeResponse(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -138,7 +136,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/barcode_response_list.py b/aspose_barcode_cloud/models/barcode_response_list.py index efae13e..7dfc434 100644 --- a/aspose_barcode_cloud/models/barcode_response_list.py +++ b/aspose_barcode_cloud/models/barcode_response_list.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class BarcodeResponseList(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -60,7 +58,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/border_dash_style.py b/aspose_barcode_cloud/models/border_dash_style.py index 7e09d4b..1deb9ba 100644 --- a/aspose_barcode_cloud/models/border_dash_style.py +++ b/aspose_barcode_cloud/models/border_dash_style.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class BorderDashStyle(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -41,7 +39,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/caption_params.py b/aspose_barcode_cloud/models/caption_params.py index 7edc66f..c292b95 100644 --- a/aspose_barcode_cloud/models/caption_params.py +++ b/aspose_barcode_cloud/models/caption_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class CaptionParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -234,7 +232,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/checksum_validation.py b/aspose_barcode_cloud/models/checksum_validation.py index aae3783..3cc7066 100644 --- a/aspose_barcode_cloud/models/checksum_validation.py +++ b/aspose_barcode_cloud/models/checksum_validation.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class ChecksumValidation(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/codabar_checksum_mode.py b/aspose_barcode_cloud/models/codabar_checksum_mode.py index 130641d..db80c97 100644 --- a/aspose_barcode_cloud/models/codabar_checksum_mode.py +++ b/aspose_barcode_cloud/models/codabar_checksum_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class CodabarChecksumMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -38,7 +36,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/codabar_params.py b/aspose_barcode_cloud/models/codabar_params.py index 419af85..3d164a6 100644 --- a/aspose_barcode_cloud/models/codabar_params.py +++ b/aspose_barcode_cloud/models/codabar_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class CodabarParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -116,7 +114,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/codabar_symbol.py b/aspose_barcode_cloud/models/codabar_symbol.py index 812a92a..c7e4a2a 100644 --- a/aspose_barcode_cloud/models/codabar_symbol.py +++ b/aspose_barcode_cloud/models/codabar_symbol.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class CodabarSymbol(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -40,7 +38,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/codablock_params.py b/aspose_barcode_cloud/models/codablock_params.py index 72cb032..6b84c6d 100644 --- a/aspose_barcode_cloud/models/codablock_params.py +++ b/aspose_barcode_cloud/models/codablock_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class CodablockParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -112,7 +110,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/code128_emulation.py b/aspose_barcode_cloud/models/code128_emulation.py index e8905ee..6559be5 100644 --- a/aspose_barcode_cloud/models/code128_emulation.py +++ b/aspose_barcode_cloud/models/code128_emulation.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class Code128Emulation(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -40,7 +38,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/code128_encode_mode.py b/aspose_barcode_cloud/models/code128_encode_mode.py index 776b21a..0e9caad 100644 --- a/aspose_barcode_cloud/models/code128_encode_mode.py +++ b/aspose_barcode_cloud/models/code128_encode_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class Code128EncodeMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -43,7 +41,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/code128_params.py b/aspose_barcode_cloud/models/code128_params.py index 1bcfc4e..3826757 100644 --- a/aspose_barcode_cloud/models/code128_params.py +++ b/aspose_barcode_cloud/models/code128_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class Code128Params(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -60,7 +58,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/code16_k_params.py b/aspose_barcode_cloud/models/code16_k_params.py index 7f55d67..4701ebe 100644 --- a/aspose_barcode_cloud/models/code16_k_params.py +++ b/aspose_barcode_cloud/models/code16_k_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class Code16KParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -116,7 +114,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/code_location.py b/aspose_barcode_cloud/models/code_location.py index d504b88..8d69e37 100644 --- a/aspose_barcode_cloud/models/code_location.py +++ b/aspose_barcode_cloud/models/code_location.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class CodeLocation(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/coupon_params.py b/aspose_barcode_cloud/models/coupon_params.py index 1df78ff..6fa5e84 100644 --- a/aspose_barcode_cloud/models/coupon_params.py +++ b/aspose_barcode_cloud/models/coupon_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class CouponParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -60,7 +58,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/customer_information_interpreting_type.py b/aspose_barcode_cloud/models/customer_information_interpreting_type.py index ddf9600..39a0148 100644 --- a/aspose_barcode_cloud/models/customer_information_interpreting_type.py +++ b/aspose_barcode_cloud/models/customer_information_interpreting_type.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class CustomerInformationInterpretingType(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/data_bar_params.py b/aspose_barcode_cloud/models/data_bar_params.py index f5f13bd..8ef0f8a 100644 --- a/aspose_barcode_cloud/models/data_bar_params.py +++ b/aspose_barcode_cloud/models/data_bar_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class DataBarParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -183,7 +181,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/data_matrix_ecc_type.py b/aspose_barcode_cloud/models/data_matrix_ecc_type.py index f84eb1c..4321f81 100644 --- a/aspose_barcode_cloud/models/data_matrix_ecc_type.py +++ b/aspose_barcode_cloud/models/data_matrix_ecc_type.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class DataMatrixEccType(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -43,7 +41,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/data_matrix_encode_mode.py b/aspose_barcode_cloud/models/data_matrix_encode_mode.py index 89a20c0..6abd516 100644 --- a/aspose_barcode_cloud/models/data_matrix_encode_mode.py +++ b/aspose_barcode_cloud/models/data_matrix_encode_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class DataMatrixEncodeMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -45,7 +43,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/data_matrix_params.py b/aspose_barcode_cloud/models/data_matrix_params.py index 184ca15..c3941f3 100644 --- a/aspose_barcode_cloud/models/data_matrix_params.py +++ b/aspose_barcode_cloud/models/data_matrix_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class DataMatrixParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -282,7 +280,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/data_matrix_version.py b/aspose_barcode_cloud/models/data_matrix_version.py index 4a38707..af78bf8 100644 --- a/aspose_barcode_cloud/models/data_matrix_version.py +++ b/aspose_barcode_cloud/models/data_matrix_version.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class DataMatrixVersion(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -107,7 +105,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/decode_barcode_type.py b/aspose_barcode_cloud/models/decode_barcode_type.py index 2b43034..25db6d9 100644 --- a/aspose_barcode_cloud/models/decode_barcode_type.py +++ b/aspose_barcode_cloud/models/decode_barcode_type.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class DecodeBarcodeType(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -121,7 +119,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/disc_usage.py b/aspose_barcode_cloud/models/disc_usage.py index 4e69c8e..b9afde2 100644 --- a/aspose_barcode_cloud/models/disc_usage.py +++ b/aspose_barcode_cloud/models/disc_usage.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class DiscUsage(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -88,7 +86,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/dot_code_encode_mode.py b/aspose_barcode_cloud/models/dot_code_encode_mode.py index 350dd29..d7197ad 100644 --- a/aspose_barcode_cloud/models/dot_code_encode_mode.py +++ b/aspose_barcode_cloud/models/dot_code_encode_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class DotCodeEncodeMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/dot_code_params.py b/aspose_barcode_cloud/models/dot_code_params.py index a3d4cf8..a150a65 100644 --- a/aspose_barcode_cloud/models/dot_code_params.py +++ b/aspose_barcode_cloud/models/dot_code_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class DotCodeParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -212,7 +210,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/eci_encodings.py b/aspose_barcode_cloud/models/eci_encodings.py index 7b06801..e59d587 100644 --- a/aspose_barcode_cloud/models/eci_encodings.py +++ b/aspose_barcode_cloud/models/eci_encodings.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class ECIEncodings(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -63,7 +61,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/enable_checksum.py b/aspose_barcode_cloud/models/enable_checksum.py index 8802d51..028153d 100644 --- a/aspose_barcode_cloud/models/enable_checksum.py +++ b/aspose_barcode_cloud/models/enable_checksum.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class EnableChecksum(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/encode_barcode_type.py b/aspose_barcode_cloud/models/encode_barcode_type.py index 480d951..4ed13f6 100644 --- a/aspose_barcode_cloud/models/encode_barcode_type.py +++ b/aspose_barcode_cloud/models/encode_barcode_type.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class EncodeBarcodeType(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -108,7 +106,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/error.py b/aspose_barcode_cloud/models/error.py index 5448f2f..9a0507a 100644 --- a/aspose_barcode_cloud/models/error.py +++ b/aspose_barcode_cloud/models/error.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class Error(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -138,7 +136,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/error_details.py b/aspose_barcode_cloud/models/error_details.py index 5ec3815..d88f13a 100644 --- a/aspose_barcode_cloud/models/error_details.py +++ b/aspose_barcode_cloud/models/error_details.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class ErrorDetails(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -87,7 +85,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/file_version.py b/aspose_barcode_cloud/models/file_version.py index 58b318d..43943c6 100644 --- a/aspose_barcode_cloud/models/file_version.py +++ b/aspose_barcode_cloud/models/file_version.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class FileVersion(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -237,7 +235,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/file_versions.py b/aspose_barcode_cloud/models/file_versions.py index 5f50189..d8cfbc5 100644 --- a/aspose_barcode_cloud/models/file_versions.py +++ b/aspose_barcode_cloud/models/file_versions.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class FileVersions(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -60,7 +58,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/files_list.py b/aspose_barcode_cloud/models/files_list.py index 55bb99b..2c2a4d4 100644 --- a/aspose_barcode_cloud/models/files_list.py +++ b/aspose_barcode_cloud/models/files_list.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class FilesList(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -60,7 +58,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/files_upload_result.py b/aspose_barcode_cloud/models/files_upload_result.py index cc27d70..b1ee6bb 100644 --- a/aspose_barcode_cloud/models/files_upload_result.py +++ b/aspose_barcode_cloud/models/files_upload_result.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class FilesUploadResult(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -86,7 +84,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/font_mode.py b/aspose_barcode_cloud/models/font_mode.py index c96d7cb..774c230 100644 --- a/aspose_barcode_cloud/models/font_mode.py +++ b/aspose_barcode_cloud/models/font_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class FontMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -38,7 +36,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/font_params.py b/aspose_barcode_cloud/models/font_params.py index c9aad01..af47c11 100644 --- a/aspose_barcode_cloud/models/font_params.py +++ b/aspose_barcode_cloud/models/font_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class FontParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -112,7 +110,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/font_style.py b/aspose_barcode_cloud/models/font_style.py index 90dfb64..5fecd62 100644 --- a/aspose_barcode_cloud/models/font_style.py +++ b/aspose_barcode_cloud/models/font_style.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class FontStyle(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -41,7 +39,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/generator_params.py b/aspose_barcode_cloud/models/generator_params.py index 4817a6f..6a68050 100644 --- a/aspose_barcode_cloud/models/generator_params.py +++ b/aspose_barcode_cloud/models/generator_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class GeneratorParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -1672,7 +1670,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/generator_params_list.py b/aspose_barcode_cloud/models/generator_params_list.py index 237b8f3..f3d9e59 100644 --- a/aspose_barcode_cloud/models/generator_params_list.py +++ b/aspose_barcode_cloud/models/generator_params_list.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class GeneratorParamsList(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -114,7 +112,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/han_xin_encode_mode.py b/aspose_barcode_cloud/models/han_xin_encode_mode.py index 056a45d..c3bc18b 100644 --- a/aspose_barcode_cloud/models/han_xin_encode_mode.py +++ b/aspose_barcode_cloud/models/han_xin_encode_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class HanXinEncodeMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -42,7 +40,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/han_xin_error_level.py b/aspose_barcode_cloud/models/han_xin_error_level.py index dfca5ad..dcc2f37 100644 --- a/aspose_barcode_cloud/models/han_xin_error_level.py +++ b/aspose_barcode_cloud/models/han_xin_error_level.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class HanXinErrorLevel(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -40,7 +38,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/han_xin_params.py b/aspose_barcode_cloud/models/han_xin_params.py index 82c8cd4..b9ac109 100644 --- a/aspose_barcode_cloud/models/han_xin_params.py +++ b/aspose_barcode_cloud/models/han_xin_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class HanXinParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -148,7 +146,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/han_xin_version.py b/aspose_barcode_cloud/models/han_xin_version.py index 6727045..3de33bc 100644 --- a/aspose_barcode_cloud/models/han_xin_version.py +++ b/aspose_barcode_cloud/models/han_xin_version.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class HanXinVersion(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -121,7 +119,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/itf14_border_type.py b/aspose_barcode_cloud/models/itf14_border_type.py index aae3ee9..612f6fd 100644 --- a/aspose_barcode_cloud/models/itf14_border_type.py +++ b/aspose_barcode_cloud/models/itf14_border_type.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class ITF14BorderType(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -41,7 +39,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/itf_params.py b/aspose_barcode_cloud/models/itf_params.py index 59675f0..99e500a 100644 --- a/aspose_barcode_cloud/models/itf_params.py +++ b/aspose_barcode_cloud/models/itf_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class ITFParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -116,7 +114,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/macro_character.py b/aspose_barcode_cloud/models/macro_character.py index 48a7f70..8f40c03 100644 --- a/aspose_barcode_cloud/models/macro_character.py +++ b/aspose_barcode_cloud/models/macro_character.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class MacroCharacter(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/maxi_code_encode_mode.py b/aspose_barcode_cloud/models/maxi_code_encode_mode.py index 2fe434a..1f276ce 100644 --- a/aspose_barcode_cloud/models/maxi_code_encode_mode.py +++ b/aspose_barcode_cloud/models/maxi_code_encode_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class MaxiCodeEncodeMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/maxi_code_mode.py b/aspose_barcode_cloud/models/maxi_code_mode.py index 80edc74..6829569 100644 --- a/aspose_barcode_cloud/models/maxi_code_mode.py +++ b/aspose_barcode_cloud/models/maxi_code_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class MaxiCodeMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -41,7 +39,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/maxi_code_params.py b/aspose_barcode_cloud/models/maxi_code_params.py index 0031d97..0cb6e22 100644 --- a/aspose_barcode_cloud/models/maxi_code_params.py +++ b/aspose_barcode_cloud/models/maxi_code_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class MaxiCodeParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -112,7 +110,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/object_exist.py b/aspose_barcode_cloud/models/object_exist.py index 4c104d6..d24d55b 100644 --- a/aspose_barcode_cloud/models/object_exist.py +++ b/aspose_barcode_cloud/models/object_exist.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class ObjectExist(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -88,7 +86,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/padding.py b/aspose_barcode_cloud/models/padding.py index 69f5b59..850d215 100644 --- a/aspose_barcode_cloud/models/padding.py +++ b/aspose_barcode_cloud/models/padding.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class Padding(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -138,7 +136,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/patch_code_params.py b/aspose_barcode_cloud/models/patch_code_params.py index 82c2e34..6a84bd0 100644 --- a/aspose_barcode_cloud/models/patch_code_params.py +++ b/aspose_barcode_cloud/models/patch_code_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class PatchCodeParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -86,7 +84,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/patch_format.py b/aspose_barcode_cloud/models/patch_format.py index f5a6945..0fca17a 100644 --- a/aspose_barcode_cloud/models/patch_format.py +++ b/aspose_barcode_cloud/models/patch_format.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class PatchFormat(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -41,7 +39,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/pdf417_compaction_mode.py b/aspose_barcode_cloud/models/pdf417_compaction_mode.py index 50dc90c..3357361 100644 --- a/aspose_barcode_cloud/models/pdf417_compaction_mode.py +++ b/aspose_barcode_cloud/models/pdf417_compaction_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class Pdf417CompactionMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -40,7 +38,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/pdf417_error_level.py b/aspose_barcode_cloud/models/pdf417_error_level.py index eb0af20..531943c 100644 --- a/aspose_barcode_cloud/models/pdf417_error_level.py +++ b/aspose_barcode_cloud/models/pdf417_error_level.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class Pdf417ErrorLevel(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -45,7 +43,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/pdf417_macro_terminator.py b/aspose_barcode_cloud/models/pdf417_macro_terminator.py index de06529..5df083f 100644 --- a/aspose_barcode_cloud/models/pdf417_macro_terminator.py +++ b/aspose_barcode_cloud/models/pdf417_macro_terminator.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class Pdf417MacroTerminator(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/pdf417_params.py b/aspose_barcode_cloud/models/pdf417_params.py index dd8ccfd..479eb1e 100644 --- a/aspose_barcode_cloud/models/pdf417_params.py +++ b/aspose_barcode_cloud/models/pdf417_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class Pdf417Params(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -742,7 +740,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/postal_params.py b/aspose_barcode_cloud/models/postal_params.py index fb45812..0f1880c 100644 --- a/aspose_barcode_cloud/models/postal_params.py +++ b/aspose_barcode_cloud/models/postal_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class PostalParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -60,7 +58,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/preset_type.py b/aspose_barcode_cloud/models/preset_type.py index 7f2f14e..106fcf9 100644 --- a/aspose_barcode_cloud/models/preset_type.py +++ b/aspose_barcode_cloud/models/preset_type.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class PresetType(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -42,7 +40,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/qr_encode_mode.py b/aspose_barcode_cloud/models/qr_encode_mode.py index 94e36f7..40949d6 100644 --- a/aspose_barcode_cloud/models/qr_encode_mode.py +++ b/aspose_barcode_cloud/models/qr_encode_mode.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class QREncodeMode(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -42,7 +40,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/qr_encode_type.py b/aspose_barcode_cloud/models/qr_encode_type.py index 12ff8c2..2b8305a 100644 --- a/aspose_barcode_cloud/models/qr_encode_type.py +++ b/aspose_barcode_cloud/models/qr_encode_type.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class QREncodeType(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/qr_error_level.py b/aspose_barcode_cloud/models/qr_error_level.py index 27852da..67b60f0 100644 --- a/aspose_barcode_cloud/models/qr_error_level.py +++ b/aspose_barcode_cloud/models/qr_error_level.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class QRErrorLevel(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -40,7 +38,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/qr_params.py b/aspose_barcode_cloud/models/qr_params.py index 613ca9a..76af60b 100644 --- a/aspose_barcode_cloud/models/qr_params.py +++ b/aspose_barcode_cloud/models/qr_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class QrParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -274,7 +272,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/qr_version.py b/aspose_barcode_cloud/models/qr_version.py index 1896404..6c10219 100644 --- a/aspose_barcode_cloud/models/qr_version.py +++ b/aspose_barcode_cloud/models/qr_version.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class QRVersion(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -81,7 +79,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/reader_params.py b/aspose_barcode_cloud/models/reader_params.py index 1a29006..9c7b376 100644 --- a/aspose_barcode_cloud/models/reader_params.py +++ b/aspose_barcode_cloud/models/reader_params.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class ReaderParams(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -1082,7 +1080,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/region_point.py b/aspose_barcode_cloud/models/region_point.py index 23041e2..1b1c9a6 100644 --- a/aspose_barcode_cloud/models/region_point.py +++ b/aspose_barcode_cloud/models/region_point.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class RegionPoint(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -88,7 +86,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/result_image_info.py b/aspose_barcode_cloud/models/result_image_info.py index 55c4316..f8d1dc5 100644 --- a/aspose_barcode_cloud/models/result_image_info.py +++ b/aspose_barcode_cloud/models/result_image_info.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class ResultImageInfo(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -113,7 +111,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/storage_exist.py b/aspose_barcode_cloud/models/storage_exist.py index 1a7179c..0ba08d8 100644 --- a/aspose_barcode_cloud/models/storage_exist.py +++ b/aspose_barcode_cloud/models/storage_exist.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class StorageExist(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -61,7 +59,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/storage_file.py b/aspose_barcode_cloud/models/storage_file.py index 1a253f5..96feb4e 100644 --- a/aspose_barcode_cloud/models/storage_file.py +++ b/aspose_barcode_cloud/models/storage_file.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class StorageFile(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -172,7 +170,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/structured_append.py b/aspose_barcode_cloud/models/structured_append.py index 458ed30..055c202 100644 --- a/aspose_barcode_cloud/models/structured_append.py +++ b/aspose_barcode_cloud/models/structured_append.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class StructuredAppend(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -116,7 +114,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/models/text_alignment.py b/aspose_barcode_cloud/models/text_alignment.py index 1add323..91af27b 100644 --- a/aspose_barcode_cloud/models/text_alignment.py +++ b/aspose_barcode_cloud/models/text_alignment.py @@ -4,8 +4,6 @@ import re # noqa: F401 import warnings # noqa: F401 -import six - class TextAlignment(object): """NOTE: This class is auto generated by the swagger code generator program. @@ -39,7 +37,7 @@ def to_dict(self): """Returns the model properties as a dict""" result = {} - for attr, _ in six.iteritems(self.swagger_types): + for attr in self.swagger_types: value = getattr(self, attr) if isinstance(value, list): result[attr] = list(map(lambda x: x.to_dict() if hasattr(x, "to_dict") else x, value)) diff --git a/aspose_barcode_cloud/rest.py b/aspose_barcode_cloud/rest.py index deebb4c..f251e7c 100644 --- a/aspose_barcode_cloud/rest.py +++ b/aspose_barcode_cloud/rest.py @@ -7,12 +7,10 @@ import logging import re import ssl +import urllib.parse import certifi -# python 2 and python 3 compatibility library -import six -from six.moves.urllib.parse import urlencode try: import urllib3 @@ -41,6 +39,7 @@ def getheader(self, name, default=None): class RESTClientObject(object): + def __init__(self, configuration, pools_size=4, maxsize=None): # urllib3.PoolManager will pass all kw parameters to connectionpool # https://github.com/shazow/urllib3/blob/f9409436f83aeb79fbaf090181cd81b784f1b8ce/urllib3/poolmanager.py#L75 # noqa: E501 @@ -134,7 +133,7 @@ def _request( timeout = None if _request_timeout: - if isinstance(_request_timeout, (int,) if six.PY3 else (int, long)): # noqa: E501,F821 + if isinstance(_request_timeout, (int,)): timeout = urllib3.Timeout(total=_request_timeout) elif isinstance(_request_timeout, tuple) and len(_request_timeout) == 2: timeout = urllib3.Timeout(connect=_request_timeout[0], read=_request_timeout[1]) @@ -146,7 +145,7 @@ def _request( # For 'POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE' if method in ["POST", "PUT", "PATCH", "OPTIONS", "DELETE"]: if query_params: - url += "?" + urlencode(query_params) + url += "?" + urllib.parse.urlencode(query_params) if re.search("json", headers["Content-Type"], re.IGNORECASE): request_body = "{}" if body is not None: @@ -220,10 +219,7 @@ def _request( if _preload_content: r = RESTResponse(r) - # In the python 3, the response.data is bytes. - # we need to decode it to string. - if six.PY3: - r.data = r.data.decode("utf8") + r.data = r.data.decode("utf8") # log response body logger.debug("response body: %s", r.data) @@ -360,6 +356,7 @@ def close(self): class ApiException(Exception): + def __init__(self, status=0, reason=None, http_resp=None): # type: (int, str, RESTResponse) -> None if http_resp: diff --git a/requirements.txt b/requirements.txt index 3cd3911..fe4f68b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ certifi >= 2017.4.17 python-dateutil >= 2.1 -six >= 1.10 urllib3 >= 1.21.1, <2.0 diff --git a/setup.py b/setup.py index 73381d2..f0f0a87 100644 --- a/setup.py +++ b/setup.py @@ -34,9 +34,7 @@ "Topic :: Software Development", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", - "Programming Language :: Python :: 2", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 2.7", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", diff --git a/tests/__init__.py b/tests/__init__.py index 1b7516d..e69de29 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,3 +0,0 @@ -import six - -six.add_move(six.MovedModule("mock", "mock", "unittest.mock")) diff --git a/tests/load_configuration.py b/tests/load_configuration.py index 1b27fab..5339d59 100644 --- a/tests/load_configuration.py +++ b/tests/load_configuration.py @@ -4,7 +4,6 @@ import json import logging import os -import six from aspose_barcode_cloud import Configuration @@ -30,9 +29,7 @@ def from_env(prefix): @rtype: Configuration """ logger.debug("Loading test configuration from env with prefix '%s'..." % prefix) - constructor_param_names = ( - inspect.getargspec(Configuration.__init__) if six.PY2 else inspect.getfullargspec(Configuration.__init__) - ).args[1:] + constructor_param_names = inspect.getfullargspec(Configuration.__init__).args[1:] kwargs = {} for name in constructor_param_names: env_name = "%s_%s" % (prefix, name.upper()) diff --git a/tests/test_headers.py b/tests/test_headers.py index a4aa7a4..44a3a1e 100644 --- a/tests/test_headers.py +++ b/tests/test_headers.py @@ -2,8 +2,7 @@ import sys import unittest - -from six.moves import mock +from unittest import mock from aspose_barcode_cloud import Configuration, ApiClient, BarcodeApi, EncodeBarcodeType from aspose_barcode_cloud.rest import RESTClientObject diff --git a/tests/test_recognize_bytes.py b/tests/test_recognize_bytes.py index 16f5a3c..f383f54 100644 --- a/tests/test_recognize_bytes.py +++ b/tests/test_recognize_bytes.py @@ -4,8 +4,6 @@ import os import unittest -import six - from aspose_barcode_cloud import PresetType, ApiClient, BarcodeApi, DecodeBarcodeType from .load_configuration import TEST_CONFIGURATION @@ -19,7 +17,6 @@ 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 diff --git a/tests/test_recognize_file.py b/tests/test_recognize_file.py index 80aaa0c..98109a5 100644 --- a/tests/test_recognize_file.py +++ b/tests/test_recognize_file.py @@ -3,14 +3,11 @@ import os import sys import unittest - -import six +import pathlib from aspose_barcode_cloud import PresetType, ApiClient, BarcodeApi, DecodeBarcodeType from .load_configuration import TEST_CONFIGURATION -if not six.PY2: - import pathlib PY35orLess = sys.version_info[0:2] <= (3, 5)