Merge branch 'master' into release

Author: YaroslawEkimov

Jenkinsfile

@@ -69,11 +69,19 @@ def runtests(dockerImageVersion)
 }
 
 node('words-linux') {
-	stage('newpy'){
+	stage('oldpy'){
 		try {
 			runtests("3.7") 
 		} finally {
 			cleanWs()
 		}
 	}
+    
+    stage('newpy'){
+		try {
+			runtests("3.10") 
+		} finally {
+			cleanWs()
+		}
+	}
 }

README.md

@@ -16,6 +16,13 @@ Python Cloud SDK wraps Aspose.Words Cloud API so you could seamlessly integrate
 - [Convert a document to desired file format](https://docs.aspose.cloud/display/wordscloud/Convert+Document+to+Destination+Format+with+Detailed+Settings+and+Save+Result+to+Storage) along with detailed settings.
 - Convert an encrypted PDF document into Word document format.
 
+## Enhancements in Version 22.2
+
+- Made 'SaveOprionsData.SaveFormat' property readonly with default value.
+- Added subclasses for all formats of SaveOprionsData with specified SaveFormat.
+- 'SaveOptionsData', 'FixedPageSaveOptionsData', 'ImageSaveOptionsData', 'OoxmlSaveOptionsData', 'TxtSaveOptionsBaseData' classes now is abstract.
+
+
 ## Enhancements in Version 22.1
 
 - Added 'FieldOptions.FieldUpdateCultureName' to set Culture for fields

asposewordscloud/__init__.py

@@ -26,7 +26,6 @@
 from asposewordscloud.models.classification_response import ClassificationResponse
 from asposewordscloud.models.classification_result import ClassificationResult
 from asposewordscloud.models.comment import Comment
-from asposewordscloud.models.comment_base import CommentBase
 from asposewordscloud.models.comment_insert import CommentInsert
 from asposewordscloud.models.comment_link import CommentLink
 from asposewordscloud.models.comment_response import CommentResponse
@@ -43,6 +42,7 @@
 from asposewordscloud.models.custom_xml_parts_collection import CustomXmlPartsCollection
 from asposewordscloud.models.custom_xml_parts_response import CustomXmlPartsResponse
 from asposewordscloud.models.custom_xml_part_update import CustomXmlPartUpdate
+from asposewordscloud.models.docm_save_options_data import DocmSaveOptionsData
 from asposewordscloud.models.doc_save_options_data import DocSaveOptionsData
 from asposewordscloud.models.document import Document
 from asposewordscloud.models.document_entry import DocumentEntry
@@ -51,11 +51,14 @@
 from asposewordscloud.models.document_properties import DocumentProperties
 from asposewordscloud.models.document_properties_response import DocumentPropertiesResponse
 from asposewordscloud.models.document_property import DocumentProperty
-from asposewordscloud.models.document_property_base import DocumentPropertyBase
 from asposewordscloud.models.document_property_create_or_update import DocumentPropertyCreateOrUpdate
 from asposewordscloud.models.document_property_response import DocumentPropertyResponse
 from asposewordscloud.models.document_response import DocumentResponse
 from asposewordscloud.models.document_stat_data import DocumentStatData
+from asposewordscloud.models.docx_save_options_data import DocxSaveOptionsData
+from asposewordscloud.models.dotm_save_options_data import DotmSaveOptionsData
+from asposewordscloud.models.dot_save_options_data import DotSaveOptionsData
+from asposewordscloud.models.dotx_save_options_data import DotxSaveOptionsData
 from asposewordscloud.models.downsample_options_data import DownsampleOptionsData
 from asposewordscloud.models.drawing_object import DrawingObject
 from asposewordscloud.models.drawing_object_collection import DrawingObjectCollection
@@ -69,7 +72,6 @@
 from asposewordscloud.models.error import Error
 from asposewordscloud.models.error_details import ErrorDetails
 from asposewordscloud.models.field import Field
-from asposewordscloud.models.field_base import FieldBase
 from asposewordscloud.models.field_collection import FieldCollection
 from asposewordscloud.models.field_insert import FieldInsert
 from asposewordscloud.models.field_link import FieldLink
@@ -82,13 +84,15 @@
 from asposewordscloud.models.file_link import FileLink
 from asposewordscloud.models.files_list import FilesList
 from asposewordscloud.models.files_upload_result import FilesUploadResult
-from asposewordscloud.models.fixed_page_save_options_data import FixedPageSaveOptionsData
+from asposewordscloud.models.flat_opc_macro_save_options_data import FlatOpcMacroSaveOptionsData
+from asposewordscloud.models.flat_opc_save_options_data import FlatOpcSaveOptionsData
+from asposewordscloud.models.flat_opc_template_macro_save_options_data import FlatOpcTemplateMacroSaveOptionsData
+from asposewordscloud.models.flat_opc_template_save_options_data import FlatOpcTemplateSaveOptionsData
 from asposewordscloud.models.font import Font
 from asposewordscloud.models.font_dto import FontDto
 from asposewordscloud.models.font_info import FontInfo
 from asposewordscloud.models.font_response import FontResponse
 from asposewordscloud.models.footnote import Footnote
-from asposewordscloud.models.footnote_base import FootnoteBase
 from asposewordscloud.models.footnote_collection import FootnoteCollection
 from asposewordscloud.models.footnote_insert import FootnoteInsert
 from asposewordscloud.models.footnote_link import FootnoteLink
@@ -115,7 +119,6 @@
 from asposewordscloud.models.hyperlink_response import HyperlinkResponse
 from asposewordscloud.models.hyperlinks import Hyperlinks
 from asposewordscloud.models.hyperlinks_response import HyperlinksResponse
-from asposewordscloud.models.image_save_options_data import ImageSaveOptionsData
 from asposewordscloud.models.info_additional_item import InfoAdditionalItem
 from asposewordscloud.models.info_response import InfoResponse
 from asposewordscloud.models.jpeg_save_options_data import JpegSaveOptionsData
@@ -145,8 +148,9 @@
 from asposewordscloud.models.office_math_object_response import OfficeMathObjectResponse
 from asposewordscloud.models.office_math_objects_collection import OfficeMathObjectsCollection
 from asposewordscloud.models.office_math_objects_response import OfficeMathObjectsResponse
-from asposewordscloud.models.ooxml_save_options_data import OoxmlSaveOptionsData
+from asposewordscloud.models.open_xps_save_options_data import OpenXpsSaveOptionsData
 from asposewordscloud.models.optimization_options import OptimizationOptions
+from asposewordscloud.models.ott_save_options_data import OttSaveOptionsData
 from asposewordscloud.models.outline_options_data import OutlineOptionsData
 from asposewordscloud.models.page_number import PageNumber
 from asposewordscloud.models.page_setup import PageSetup
@@ -185,14 +189,12 @@
 from asposewordscloud.models.revisions_modification_response import RevisionsModificationResponse
 from asposewordscloud.models.rtf_save_options_data import RtfSaveOptionsData
 from asposewordscloud.models.run import Run
-from asposewordscloud.models.run_base import RunBase
 from asposewordscloud.models.run_insert import RunInsert
 from asposewordscloud.models.run_link import RunLink
 from asposewordscloud.models.run_response import RunResponse
 from asposewordscloud.models.runs import Runs
 from asposewordscloud.models.runs_response import RunsResponse
 from asposewordscloud.models.run_update import RunUpdate
-from asposewordscloud.models.save_options_data import SaveOptionsData
 from asposewordscloud.models.save_response import SaveResponse
 from asposewordscloud.models.save_result import SaveResult
 from asposewordscloud.models.search_response import SearchResponse
@@ -249,14 +251,14 @@
 from asposewordscloud.models.text_save_options_data import TextSaveOptionsData
 from asposewordscloud.models.tiff_save_options_data import TiffSaveOptionsData
 from asposewordscloud.models.time_zone_info_data import TimeZoneInfoData
-from asposewordscloud.models.txt_save_options_base_data import TxtSaveOptionsBaseData
 from asposewordscloud.models.user_information import UserInformation
 from asposewordscloud.models.watermark_text import WatermarkText
 from asposewordscloud.models.word_ml_save_options_data import WordMLSaveOptionsData
 from asposewordscloud.models.words_api_error_response import WordsApiErrorResponse
 from asposewordscloud.models.words_api_link import WordsApiLink
 from asposewordscloud.models.words_response import WordsResponse
 from asposewordscloud.models.xaml_fixed_save_options_data import XamlFixedSaveOptionsData
+from asposewordscloud.models.xaml_flow_pack_save_options_data import XamlFlowPackSaveOptionsData
 from asposewordscloud.models.xaml_flow_save_options_data import XamlFlowSaveOptionsData
 from asposewordscloud.models.xml_color import XmlColor
 from asposewordscloud.models.xml_data_load_options import XmlDataLoadOptions

asposewordscloud/api_client.py

@@ -83,12 +83,12 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
 
         self.pool = None
         self.rest_client = rest.RESTClientObject(configuration)
-        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '22.1'}
+        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '22.2'}
         if header_name is not None:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'python sdk 22.1'
+        self.user_agent = 'python sdk 22.2'
 
     def __del__(self):
         if not self.pool is None:

asposewordscloud/configuration.py

@@ -258,6 +258,6 @@ def to_debug_report(self):
         return "Python SDK Debug Report:\n"\
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
-               "Version of the API: 22.1\n"\
-               "SDK Package Version: 22.1".\
+               "Version of the API: 22.2\n"\
+               "SDK Package Version: 22.2".\
                format(env=sys.platform, pyversion=sys.version)

asposewordscloud/models/__init__.py

@@ -21,7 +21,6 @@
 from asposewordscloud.models.classification_response import ClassificationResponse
 from asposewordscloud.models.classification_result import ClassificationResult
 from asposewordscloud.models.comment import Comment
-from asposewordscloud.models.comment_base import CommentBase
 from asposewordscloud.models.comment_insert import CommentInsert
 from asposewordscloud.models.comment_link import CommentLink
 from asposewordscloud.models.comment_response import CommentResponse
@@ -38,6 +37,7 @@
 from asposewordscloud.models.custom_xml_parts_collection import CustomXmlPartsCollection
 from asposewordscloud.models.custom_xml_parts_response import CustomXmlPartsResponse
 from asposewordscloud.models.custom_xml_part_update import CustomXmlPartUpdate
+from asposewordscloud.models.docm_save_options_data import DocmSaveOptionsData
 from asposewordscloud.models.doc_save_options_data import DocSaveOptionsData
 from asposewordscloud.models.document import Document
 from asposewordscloud.models.document_entry import DocumentEntry
@@ -46,11 +46,14 @@
 from asposewordscloud.models.document_properties import DocumentProperties
 from asposewordscloud.models.document_properties_response import DocumentPropertiesResponse
 from asposewordscloud.models.document_property import DocumentProperty
-from asposewordscloud.models.document_property_base import DocumentPropertyBase
 from asposewordscloud.models.document_property_create_or_update import DocumentPropertyCreateOrUpdate
 from asposewordscloud.models.document_property_response import DocumentPropertyResponse
 from asposewordscloud.models.document_response import DocumentResponse
 from asposewordscloud.models.document_stat_data import DocumentStatData
+from asposewordscloud.models.docx_save_options_data import DocxSaveOptionsData
+from asposewordscloud.models.dotm_save_options_data import DotmSaveOptionsData
+from asposewordscloud.models.dot_save_options_data import DotSaveOptionsData
+from asposewordscloud.models.dotx_save_options_data import DotxSaveOptionsData
 from asposewordscloud.models.downsample_options_data import DownsampleOptionsData
 from asposewordscloud.models.drawing_object import DrawingObject
 from asposewordscloud.models.drawing_object_collection import DrawingObjectCollection
@@ -64,7 +67,6 @@
 from asposewordscloud.models.error import Error
 from asposewordscloud.models.error_details import ErrorDetails
 from asposewordscloud.models.field import Field
-from asposewordscloud.models.field_base import FieldBase
 from asposewordscloud.models.field_collection import FieldCollection
 from asposewordscloud.models.field_insert import FieldInsert
 from asposewordscloud.models.field_link import FieldLink
@@ -77,13 +79,15 @@
 from asposewordscloud.models.file_link import FileLink
 from asposewordscloud.models.files_list import FilesList
 from asposewordscloud.models.files_upload_result import FilesUploadResult
-from asposewordscloud.models.fixed_page_save_options_data import FixedPageSaveOptionsData
+from asposewordscloud.models.flat_opc_macro_save_options_data import FlatOpcMacroSaveOptionsData
+from asposewordscloud.models.flat_opc_save_options_data import FlatOpcSaveOptionsData
+from asposewordscloud.models.flat_opc_template_macro_save_options_data import FlatOpcTemplateMacroSaveOptionsData
+from asposewordscloud.models.flat_opc_template_save_options_data import FlatOpcTemplateSaveOptionsData
 from asposewordscloud.models.font import Font
 from asposewordscloud.models.font_dto import FontDto
 from asposewordscloud.models.font_info import FontInfo
 from asposewordscloud.models.font_response import FontResponse
 from asposewordscloud.models.footnote import Footnote
-from asposewordscloud.models.footnote_base import FootnoteBase
 from asposewordscloud.models.footnote_collection import FootnoteCollection
 from asposewordscloud.models.footnote_insert import FootnoteInsert
 from asposewordscloud.models.footnote_link import FootnoteLink
@@ -110,7 +114,6 @@
 from asposewordscloud.models.hyperlink_response import HyperlinkResponse
 from asposewordscloud.models.hyperlinks import Hyperlinks
 from asposewordscloud.models.hyperlinks_response import HyperlinksResponse
-from asposewordscloud.models.image_save_options_data import ImageSaveOptionsData
 from asposewordscloud.models.info_additional_item import InfoAdditionalItem
 from asposewordscloud.models.info_response import InfoResponse
 from asposewordscloud.models.jpeg_save_options_data import JpegSaveOptionsData
@@ -140,8 +143,9 @@
 from asposewordscloud.models.office_math_object_response import OfficeMathObjectResponse
 from asposewordscloud.models.office_math_objects_collection import OfficeMathObjectsCollection
 from asposewordscloud.models.office_math_objects_response import OfficeMathObjectsResponse
-from asposewordscloud.models.ooxml_save_options_data import OoxmlSaveOptionsData
+from asposewordscloud.models.open_xps_save_options_data import OpenXpsSaveOptionsData
 from asposewordscloud.models.optimization_options import OptimizationOptions
+from asposewordscloud.models.ott_save_options_data import OttSaveOptionsData
 from asposewordscloud.models.outline_options_data import OutlineOptionsData
 from asposewordscloud.models.page_number import PageNumber
 from asposewordscloud.models.page_setup import PageSetup
@@ -180,14 +184,12 @@
 from asposewordscloud.models.revisions_modification_response import RevisionsModificationResponse
 from asposewordscloud.models.rtf_save_options_data import RtfSaveOptionsData
 from asposewordscloud.models.run import Run
-from asposewordscloud.models.run_base import RunBase
 from asposewordscloud.models.run_insert import RunInsert
 from asposewordscloud.models.run_link import RunLink
 from asposewordscloud.models.run_response import RunResponse
 from asposewordscloud.models.runs import Runs
 from asposewordscloud.models.runs_response import RunsResponse
 from asposewordscloud.models.run_update import RunUpdate
-from asposewordscloud.models.save_options_data import SaveOptionsData
 from asposewordscloud.models.save_response import SaveResponse
 from asposewordscloud.models.save_result import SaveResult
 from asposewordscloud.models.search_response import SearchResponse
@@ -244,14 +246,14 @@
 from asposewordscloud.models.text_save_options_data import TextSaveOptionsData
 from asposewordscloud.models.tiff_save_options_data import TiffSaveOptionsData
 from asposewordscloud.models.time_zone_info_data import TimeZoneInfoData
-from asposewordscloud.models.txt_save_options_base_data import TxtSaveOptionsBaseData
 from asposewordscloud.models.user_information import UserInformation
 from asposewordscloud.models.watermark_text import WatermarkText
 from asposewordscloud.models.word_ml_save_options_data import WordMLSaveOptionsData
 from asposewordscloud.models.words_api_error_response import WordsApiErrorResponse
 from asposewordscloud.models.words_api_link import WordsApiLink
 from asposewordscloud.models.words_response import WordsResponse
 from asposewordscloud.models.xaml_fixed_save_options_data import XamlFixedSaveOptionsData
+from asposewordscloud.models.xaml_flow_pack_save_options_data import XamlFlowPackSaveOptionsData
 from asposewordscloud.models.xaml_flow_save_options_data import XamlFlowSaveOptionsData
 from asposewordscloud.models.xml_color import XmlColor
 from asposewordscloud.models.xml_data_load_options import XmlDataLoadOptions