Merge pull request #3 from kaferi/master

 Updated to 18.5

Author: evgeny-porodnov

.swagger-codegen-ignore

@@ -32,4 +32,4 @@ test/**
 # Ignore other files and folders
 *requirements.txt
 tox.ini
-setup.py
+#setup.py

asposepdfcloud/__init__.py

@@ -38,7 +38,9 @@
 from .models.color_depth import ColorDepth
 from .models.compression_type import CompressionType
 from .models.doc_format import DocFormat
+from .models.doc_recognition_mode import DocRecognitionMode
 from .models.document_privilege import DocumentPrivilege
+from .models.epub_recognition_mode import EpubRecognitionMode
 from .models.field_type import FieldType
 from .models.font_encoding_rules import FontEncodingRules
 from .models.font_saving_modes import FontSavingModes
@@ -61,8 +63,6 @@
 from .models.parts_embedding_modes import PartsEmbeddingModes
 from .models.pdf_a_type import PdfAType
 from .models.raster_images_saving_modes import RasterImagesSavingModes
-from .models.recognition_mode import RecognitionMode
-from .models.recognition_mode2 import RecognitionMode2
 from .models.rectangle import Rectangle
 from .models.rotation import Rotation
 from .models.saa_spose_response import SaaSposeResponse

asposepdfcloud/apis/pdf_api.py

@@ -206,5 +206,5 @@ def to_debug_report(self):
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 1.1\n"\
-               "SDK Package Version: 18.4.0".\
+               "SDK Package Version: 18.5.0".\
                format(env=sys.platform, pyversion=sys.version)

asposepdfcloud/configuration.py

@@ -38,7 +38,9 @@
 from .color_depth import ColorDepth
 from .compression_type import CompressionType
 from .doc_format import DocFormat
+from .doc_recognition_mode import DocRecognitionMode
 from .document_privilege import DocumentPrivilege
+from .epub_recognition_mode import EpubRecognitionMode
 from .field_type import FieldType
 from .font_encoding_rules import FontEncodingRules
 from .font_saving_modes import FontSavingModes
@@ -61,8 +63,6 @@
 from .parts_embedding_modes import PartsEmbeddingModes
 from .pdf_a_type import PdfAType
 from .raster_images_saving_modes import RasterImagesSavingModes
-from .recognition_mode import RecognitionMode
-from .recognition_mode2 import RecognitionMode2
 from .rectangle import Rectangle
 from .rotation import Rotation
 from .saa_spose_response import SaaSposeResponse

asposepdfcloud/models/__init__.py

@@ -34,7 +34,7 @@
 import re
 
 
-class RecognitionMode(object):
+class DocRecognitionMode(object):
     """
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
@@ -63,7 +63,7 @@ class RecognitionMode(object):
 
     def __init__(self):
         """
-        RecognitionMode - a model defined in Swagger
+        DocRecognitionMode - a model defined in Swagger
         """
 
 
@@ -110,7 +110,7 @@ def __eq__(self, other):
         """
         Returns true if both objects are equal
         """
-        if not isinstance(other, RecognitionMode):
+        if not isinstance(other, DocRecognitionMode):
             return False
 
         return self.__dict__ == other.__dict__

asposepdfcloud/models/recognition_mode.py renamed to asposepdfcloud/models/doc_recognition_mode.py

@@ -34,7 +34,7 @@
 import re
 
 
-class RecognitionMode2(object):
+class EpubRecognitionMode(object):
     """
     NOTE: This class is auto generated by the swagger code generator program.
     Do not edit the class manually.
@@ -64,7 +64,7 @@ class RecognitionMode2(object):
 
     def __init__(self):
         """
-        RecognitionMode2 - a model defined in Swagger
+        EpubRecognitionMode - a model defined in Swagger
         """
 
 
@@ -111,7 +111,7 @@ def __eq__(self, other):
         """
         Returns true if both objects are equal
         """
-        if not isinstance(other, RecognitionMode2):
+        if not isinstance(other, EpubRecognitionMode):
             return False
 
         return self.__dict__ == other.__dict__

asposepdfcloud/models/recognition_mode2.py renamed to asposepdfcloud/models/epub_recognition_mode.py

@@ -43,8 +43,8 @@ class HtmlDocumentType(object):
     """
     allowed enum values
     """
-    XHTML = 0
-    HTML_5 = 1
+    XHTML = "Xhtml"
+    HTML5 = "Html5"
 
     """
     Attributes:

asposepdfcloud/models/html_document_type.py

@@ -155,7 +155,7 @@ def request(self, method, url, query_params=None, headers=None,
         post_params = post_params or {}
         headers = headers or {}
 
-        timeout = None
+        timeout = 5 * 60
         if _request_timeout:
             if isinstance(_request_timeout, (int, ) if PY3 else (int, long)):
                 timeout = urllib3.Timeout(total=_request_timeout)

asposepdfcloud/rest.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 """
-    Aspose.Pdf for Cloud API Reference
+    Aspose.PDF for Cloud API Reference
 
 
    Copyright (c) 2018 Aspose.Pdf for Cloud
@@ -33,7 +33,7 @@
 from setuptools import setup, find_packages
 
 NAME = "asposepdfcloud"
-VERSION = "18.4.0"
+VERSION = "18.5.0"
 # To install the library, run the following
 #
 # python setup.py install
@@ -62,7 +62,7 @@
     ],
     keywords=["swagger", "aspose", "aspose cloud", "pdf", "sdk", "xls", "pdf/a", "xps", "tiff", "svg", "html", "doc"],
     install_requires=REQUIRES,
-    extras_require={ 
+    extras_require={
         'test': ["requests >= 2.18.4",
                 "coverage >= 4.0.3",
                 "nose >= 1.3.7",
@@ -71,7 +71,7 @@
                 "randomize >= 0.13"],
     },
     packages=find_packages(exclude=['test']),
-    project_urls={  
+    project_urls={
         'Source With Tests': 'https://github.com/aspose-pdf-cloud/aspose-pdf-cloud-python',
         'Website': 'https://www.aspose.cloud',
         'Product Home': 'https://products.aspose.cloud/pdf/cloud',