Merge branch 'master' into release

Author: YaroslawEkimov

Examples/AcceptAllRevisions.py

@@ -5,7 +5,7 @@
 from shutil import copyfile
 
 words_api = WordsApi(client_id = '####-####-####-####-####', client_secret = '##################') 
-file_name = 'test_doc.docx'
+file_name= 'test_doc.docx'
 
 # Upload original document to cloud storage.
 my_var1 = open(file_name, 'rb')

Examples/AcceptAllRevisionsOnline.py

@@ -1,5 +1,5 @@
 words_api = WordsApi(client_id = '####-####-####-####-####', client_secret = '##################') 
-file_name = 'test_doc.docx'
+file_name= 'test_doc.docx'
 
 # Calls AcceptAllRevisionsOnline method for document in cloud.
 request_document = open(file_name, 'rb')

README.md

@@ -16,6 +16,10 @@ 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 21.12
+
+
+
 ## Enhancements in Version 21.11
 
 

TestData/DocumentActions/MailMerge/TestMailMergeData.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" standalone="yes"?>
+<NewDataSet>
+  <info>
+    <FirstName>Alexey</FirstName>
+    <LastName>Noskov</LastName>
+    <City>Kharkov</City>
+    <Company>Aspose</Company>
+  </info>
+</NewDataSet>

TestData/DocumentActions/MailMerge/TestMailMergeWithOptions.docx

@@ -75,6 +75,7 @@
 from asposewordscloud.models.field_link import FieldLink
 from asposewordscloud.models.field_names import FieldNames
 from asposewordscloud.models.field_names_response import FieldNamesResponse
+from asposewordscloud.models.field_options import FieldOptions
 from asposewordscloud.models.field_response import FieldResponse
 from asposewordscloud.models.fields_response import FieldsResponse
 from asposewordscloud.models.field_update import FieldUpdate
@@ -115,6 +116,8 @@
 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
 from asposewordscloud.models.json_data_load_options import JsonDataLoadOptions
 from asposewordscloud.models.link import Link
@@ -247,6 +250,7 @@
 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

asposewordscloud/__init__.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': '21.11'}
+        self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '21.12'}
         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 21.11'
+        self.user_agent = 'python sdk 21.12'
 
     def __del__(self):
         if not self.pool is None: