Skip to content

Commit 5c6c935

Browse files
Merge branch 'master' into release
2 parents e195b45 + 776d942 commit 5c6c935

File tree

78 files changed

+2361
-1507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2361
-1507
lines changed

Examples/AcceptAllRevisions.py

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import os
2+
import asposewordscloud
3+
import asposewordscloud.models.requests
4+
from asposewordscloud.rest import ApiException
5+
from shutil import copyfile
6+
7+
documents_dir = '...'
8+
words_api = WordsApi(client_id = '####-####-####-####-####', client_secret = '##################')
9+
file_name = 'test_doc.docx'
10+
11+
# Upload original document to cloud storage.
12+
upload_file_request = asposewordscloud.models.requests.UploadFileRequest(file_content = open(os.path.join(documents_dir, file_name), 'rb'),path = file_name)
13+
words_api.upload_file(upload_file_request)
14+
15+
# Calls AcceptAllRevisions method for document in cloud.
16+
request = asposewordscloud.models.requests.AcceptAllRevisionsRequest(name = file_name)
17+
words_api.accept_all_revisions(request)
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
documents_dir = '...'
2+
words_api = WordsApi(client_id = '####-####-####-####-####', client_secret = '##################')
3+
file_name = 'test_doc.docx'
4+
5+
# Calls AcceptAllRevisionsOnline method for document in cloud.
6+
request = asposewordscloud.models.requests.AcceptAllRevisionsOnlineRequest(document = open(os.path.join(documents_dir, file_name), 'rb'))
7+
accept_all_revisions_online_result = words_api.accept_all_revisions_online(request)
8+
copyfile(accept_all_revisions_online_result.document, 'test_result.docx')

ExamplesData/test_doc.docx

14 KB
Binary file not shown.

Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ properties([
55
[$class: 'StringParameterDefinition', name: 'branch', defaultValue: 'master', description: 'the branch to build'],
66
[$class: 'StringParameterDefinition', name: 'apiUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'api url'],
77
[$class: 'BooleanParameterDefinition', name: 'ignoreCiSkip', defaultValue: false, description: 'ignore CI Skip'],
8+
[$class: 'StringParameterDefinition', name: 'credentialsId', defaultValue: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', description: 'credentials id'],
89
]
910
]
1011
])
@@ -25,7 +26,7 @@ def runtests(dockerImageVersion)
2526
sh 'git clean -fdx'
2627

2728
if (needToBuild) {
28-
withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
29+
withCredentials([usernamePassword(credentialsId: params.credentialsId, passwordVariable: 'ClientSecret', usernameVariable: 'ClientId')]) {
2930
sh 'mkdir -p Settings'
3031
sh 'echo "{\\"ClientId\\": \\"$ClientId\\",\\"ClientSecret\\": \\"$ClientSecret\\", \\"BaseUrl\\": \\"$apiUrl\\"}" > Settings/servercreds.json'
3132
}

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ Python Cloud SDK wraps Aspose.Words Cloud API so you could seamlessly integrate
1616
- [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.
1717
- Convert an encrypted PDF document into Word document format.
1818

19+
## Enhancements in Version 21.3
20+
21+
- Added 'UpdateCreatedTimeProperty' save option
22+
- Added Tables into HeaderFooter so it's possible to address paragraphs inside table which is located in headerfooter (sections/0/headersfooters/1/tables/0/rows/0/cells/0/paragraphs/0)
23+
24+
1925
## Enhancements in Version 21.2
2026

2127
- Added delete all comments method

asposewordscloud/api_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
8181

8282
self.pool = ThreadPool()
8383
self.rest_client = rest.RESTClientObject(configuration)
84-
self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '21.2'}
84+
self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '21.3'}
8585
if header_name is not None:
8686
self.default_headers[header_name] = header_value
8787
self.cookie = cookie
8888
# Set default User-Agent.
89-
self.user_agent = 'python sdk 21.2'
89+
self.user_agent = 'python sdk 21.3'
9090

9191
def __del__(self):
9292
self.pool.close()

asposewordscloud/configuration.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,6 @@ def to_debug_report(self):
258258
return "Python SDK Debug Report:\n"\
259259
"OS: {env}\n"\
260260
"Python Version: {pyversion}\n"\
261-
"Version of the API: 21.2\n"\
262-
"SDK Package Version: 21.2".\
261+
"Version of the API: 21.3\n"\
262+
"SDK Package Version: 21.3".\
263263
format(env=sys.platform, pyversion=sys.version)

asposewordscloud/models/bmp_save_options_data.py

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class BmpSaveOptionsData(object):
4949
'dml_rendering_mode': 'str',
5050
'file_name': 'str',
5151
'save_format': 'str',
52+
'update_created_time_property': 'bool',
5253
'update_fields': 'bool',
5354
'update_last_printed_property': 'bool',
5455
'update_last_saved_time_property': 'bool',
@@ -83,6 +84,7 @@ class BmpSaveOptionsData(object):
8384
'dml_rendering_mode': 'DmlRenderingMode',
8485
'file_name': 'FileName',
8586
'save_format': 'SaveFormat',
87+
'update_created_time_property': 'UpdateCreatedTimeProperty',
8688
'update_fields': 'UpdateFields',
8789
'update_last_printed_property': 'UpdateLastPrintedProperty',
8890
'update_last_saved_time_property': 'UpdateLastSavedTimeProperty',
@@ -110,7 +112,7 @@ class BmpSaveOptionsData(object):
110112
'vertical_resolution': 'VerticalResolution'
111113
}
112114

113-
def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_rendering_mode=None, dml_effects_rendering_mode=None, dml_rendering_mode=None, file_name=None, save_format=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=None, update_sdt_content=None, zip_output=None, color_mode=None, jpeg_quality=None, metafile_rendering_options=None, numeral_format=None, optimize_output=None, page_count=None, page_index=None, graphics_quality_options=None, horizontal_resolution=None, image_brightness=None, image_color_mode=None, image_contrast=None, paper_color=None, pixel_format=None, resolution=None, scale=None, use_anti_aliasing=None, use_gdi_emf_renderer=None, use_high_quality_rendering=None, vertical_resolution=None): # noqa: E501
115+
def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_rendering_mode=None, dml_effects_rendering_mode=None, dml_rendering_mode=None, file_name=None, save_format=None, update_created_time_property=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=None, update_sdt_content=None, zip_output=None, color_mode=None, jpeg_quality=None, metafile_rendering_options=None, numeral_format=None, optimize_output=None, page_count=None, page_index=None, graphics_quality_options=None, horizontal_resolution=None, image_brightness=None, image_color_mode=None, image_contrast=None, paper_color=None, pixel_format=None, resolution=None, scale=None, use_anti_aliasing=None, use_gdi_emf_renderer=None, use_high_quality_rendering=None, vertical_resolution=None): # noqa: E501
114116
"""BmpSaveOptionsData - a model defined in Swagger""" # noqa: E501
115117

116118
self._allow_embedding_post_script_fonts = None
@@ -119,6 +121,7 @@ def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_render
119121
self._dml_rendering_mode = None
120122
self._file_name = None
121123
self._save_format = None
124+
self._update_created_time_property = None
122125
self._update_fields = None
123126
self._update_last_printed_property = None
124127
self._update_last_saved_time_property = None
@@ -158,6 +161,8 @@ def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_render
158161
self.file_name = file_name
159162
if save_format is not None:
160163
self.save_format = save_format
164+
if update_created_time_property is not None:
165+
self.update_created_time_property = update_created_time_property
161166
if update_fields is not None:
162167
self.update_fields = update_fields
163168
if update_last_printed_property is not None:
@@ -349,6 +354,28 @@ def save_format(self, save_format):
349354
"""
350355
self._save_format = save_format
351356

357+
@property
358+
def update_created_time_property(self):
359+
"""Gets the update_created_time_property of this BmpSaveOptionsData. # noqa: E501
360+
361+
Gets or sets a value determining whether the Aspose.Words.Properties.BuiltInDocumentProperties.CreatedTime property is updated before saving. Default value is false. # noqa: E501
362+
363+
:return: The update_created_time_property of this BmpSaveOptionsData. # noqa: E501
364+
:rtype: bool
365+
"""
366+
return self._update_created_time_property
367+
368+
@update_created_time_property.setter
369+
def update_created_time_property(self, update_created_time_property):
370+
"""Sets the update_created_time_property of this BmpSaveOptionsData.
371+
372+
Gets or sets a value determining whether the Aspose.Words.Properties.BuiltInDocumentProperties.CreatedTime property is updated before saving. Default value is false. # noqa: E501
373+
374+
:param update_created_time_property: The update_created_time_property of this BmpSaveOptionsData. # noqa: E501
375+
:type: bool
376+
"""
377+
self._update_created_time_property = update_created_time_property
378+
352379
@property
353380
def update_fields(self):
354381
"""Gets the update_fields of this BmpSaveOptionsData. # noqa: E501

asposewordscloud/models/doc_save_options_data.py

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class DocSaveOptionsData(object):
4949
'dml_rendering_mode': 'str',
5050
'file_name': 'str',
5151
'save_format': 'str',
52+
'update_created_time_property': 'bool',
5253
'update_fields': 'bool',
5354
'update_last_printed_property': 'bool',
5455
'update_last_saved_time_property': 'bool',
@@ -67,6 +68,7 @@ class DocSaveOptionsData(object):
6768
'dml_rendering_mode': 'DmlRenderingMode',
6869
'file_name': 'FileName',
6970
'save_format': 'SaveFormat',
71+
'update_created_time_property': 'UpdateCreatedTimeProperty',
7072
'update_fields': 'UpdateFields',
7173
'update_last_printed_property': 'UpdateLastPrintedProperty',
7274
'update_last_saved_time_property': 'UpdateLastSavedTimeProperty',
@@ -78,7 +80,7 @@ class DocSaveOptionsData(object):
7880
'save_routing_slip': 'SaveRoutingSlip'
7981
}
8082

81-
def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_rendering_mode=None, dml_effects_rendering_mode=None, dml_rendering_mode=None, file_name=None, save_format=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=None, update_sdt_content=None, zip_output=None, always_compress_metafiles=None, password=None, save_picture_bullet=None, save_routing_slip=None): # noqa: E501
83+
def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_rendering_mode=None, dml_effects_rendering_mode=None, dml_rendering_mode=None, file_name=None, save_format=None, update_created_time_property=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=None, update_sdt_content=None, zip_output=None, always_compress_metafiles=None, password=None, save_picture_bullet=None, save_routing_slip=None): # noqa: E501
8284
"""DocSaveOptionsData - a model defined in Swagger""" # noqa: E501
8385

8486
self._allow_embedding_post_script_fonts = None
@@ -87,6 +89,7 @@ def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_render
8789
self._dml_rendering_mode = None
8890
self._file_name = None
8991
self._save_format = None
92+
self._update_created_time_property = None
9093
self._update_fields = None
9194
self._update_last_printed_property = None
9295
self._update_last_saved_time_property = None
@@ -110,6 +113,8 @@ def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_render
110113
self.file_name = file_name
111114
if save_format is not None:
112115
self.save_format = save_format
116+
if update_created_time_property is not None:
117+
self.update_created_time_property = update_created_time_property
113118
if update_fields is not None:
114119
self.update_fields = update_fields
115120
if update_last_printed_property is not None:
@@ -269,6 +274,28 @@ def save_format(self, save_format):
269274
"""
270275
self._save_format = save_format
271276

277+
@property
278+
def update_created_time_property(self):
279+
"""Gets the update_created_time_property of this DocSaveOptionsData. # noqa: E501
280+
281+
Gets or sets a value determining whether the Aspose.Words.Properties.BuiltInDocumentProperties.CreatedTime property is updated before saving. Default value is false. # noqa: E501
282+
283+
:return: The update_created_time_property of this DocSaveOptionsData. # noqa: E501
284+
:rtype: bool
285+
"""
286+
return self._update_created_time_property
287+
288+
@update_created_time_property.setter
289+
def update_created_time_property(self, update_created_time_property):
290+
"""Sets the update_created_time_property of this DocSaveOptionsData.
291+
292+
Gets or sets a value determining whether the Aspose.Words.Properties.BuiltInDocumentProperties.CreatedTime property is updated before saving. Default value is false. # noqa: E501
293+
294+
:param update_created_time_property: The update_created_time_property of this DocSaveOptionsData. # noqa: E501
295+
:type: bool
296+
"""
297+
self._update_created_time_property = update_created_time_property
298+
272299
@property
273300
def update_fields(self):
274301
"""Gets the update_fields of this DocSaveOptionsData. # noqa: E501

asposewordscloud/models/emf_save_options_data.py

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class EmfSaveOptionsData(object):
4949
'dml_rendering_mode': 'str',
5050
'file_name': 'str',
5151
'save_format': 'str',
52+
'update_created_time_property': 'bool',
5253
'update_fields': 'bool',
5354
'update_last_printed_property': 'bool',
5455
'update_last_saved_time_property': 'bool',
@@ -83,6 +84,7 @@ class EmfSaveOptionsData(object):
8384
'dml_rendering_mode': 'DmlRenderingMode',
8485
'file_name': 'FileName',
8586
'save_format': 'SaveFormat',
87+
'update_created_time_property': 'UpdateCreatedTimeProperty',
8688
'update_fields': 'UpdateFields',
8789
'update_last_printed_property': 'UpdateLastPrintedProperty',
8890
'update_last_saved_time_property': 'UpdateLastSavedTimeProperty',
@@ -110,7 +112,7 @@ class EmfSaveOptionsData(object):
110112
'vertical_resolution': 'VerticalResolution'
111113
}
112114

113-
def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_rendering_mode=None, dml_effects_rendering_mode=None, dml_rendering_mode=None, file_name=None, save_format=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=None, update_sdt_content=None, zip_output=None, color_mode=None, jpeg_quality=None, metafile_rendering_options=None, numeral_format=None, optimize_output=None, page_count=None, page_index=None, graphics_quality_options=None, horizontal_resolution=None, image_brightness=None, image_color_mode=None, image_contrast=None, paper_color=None, pixel_format=None, resolution=None, scale=None, use_anti_aliasing=None, use_gdi_emf_renderer=None, use_high_quality_rendering=None, vertical_resolution=None): # noqa: E501
115+
def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_rendering_mode=None, dml_effects_rendering_mode=None, dml_rendering_mode=None, file_name=None, save_format=None, update_created_time_property=None, update_fields=None, update_last_printed_property=None, update_last_saved_time_property=None, update_sdt_content=None, zip_output=None, color_mode=None, jpeg_quality=None, metafile_rendering_options=None, numeral_format=None, optimize_output=None, page_count=None, page_index=None, graphics_quality_options=None, horizontal_resolution=None, image_brightness=None, image_color_mode=None, image_contrast=None, paper_color=None, pixel_format=None, resolution=None, scale=None, use_anti_aliasing=None, use_gdi_emf_renderer=None, use_high_quality_rendering=None, vertical_resolution=None): # noqa: E501
114116
"""EmfSaveOptionsData - a model defined in Swagger""" # noqa: E501
115117

116118
self._allow_embedding_post_script_fonts = None
@@ -119,6 +121,7 @@ def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_render
119121
self._dml_rendering_mode = None
120122
self._file_name = None
121123
self._save_format = None
124+
self._update_created_time_property = None
122125
self._update_fields = None
123126
self._update_last_printed_property = None
124127
self._update_last_saved_time_property = None
@@ -158,6 +161,8 @@ def __init__(self, allow_embedding_post_script_fonts=None, dml3_d_effects_render
158161
self.file_name = file_name
159162
if save_format is not None:
160163
self.save_format = save_format
164+
if update_created_time_property is not None:
165+
self.update_created_time_property = update_created_time_property
161166
if update_fields is not None:
162167
self.update_fields = update_fields
163168
if update_last_printed_property is not None:
@@ -349,6 +354,28 @@ def save_format(self, save_format):
349354
"""
350355
self._save_format = save_format
351356

357+
@property
358+
def update_created_time_property(self):
359+
"""Gets the update_created_time_property of this EmfSaveOptionsData. # noqa: E501
360+
361+
Gets or sets a value determining whether the Aspose.Words.Properties.BuiltInDocumentProperties.CreatedTime property is updated before saving. Default value is false. # noqa: E501
362+
363+
:return: The update_created_time_property of this EmfSaveOptionsData. # noqa: E501
364+
:rtype: bool
365+
"""
366+
return self._update_created_time_property
367+
368+
@update_created_time_property.setter
369+
def update_created_time_property(self, update_created_time_property):
370+
"""Sets the update_created_time_property of this EmfSaveOptionsData.
371+
372+
Gets or sets a value determining whether the Aspose.Words.Properties.BuiltInDocumentProperties.CreatedTime property is updated before saving. Default value is false. # noqa: E501
373+
374+
:param update_created_time_property: The update_created_time_property of this EmfSaveOptionsData. # noqa: E501
375+
:type: bool
376+
"""
377+
self._update_created_time_property = update_created_time_property
378+
352379
@property
353380
def update_fields(self):
354381
"""Gets the update_fields of this EmfSaveOptionsData. # noqa: E501

0 commit comments

Comments
 (0)