Skip to content

Commit 98d7d04

Browse files
Merge branch 'master' into release
2 parents 091d92a + e73095f commit 98d7d04

File tree

644 files changed

+39721
-5286
lines changed

Some content is hidden

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

644 files changed

+39721
-5286
lines changed

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ 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.1
20+
21+
- Added online version for all API methods
22+
23+
1924
## Enhancements in Version 20.11
2025

2126
- In configuration json file appSid / appKey has been replaced to clientId / clientSecret.

asposewordscloud/__init__.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
from asposewordscloud.models.files_upload_result import FilesUploadResult
7777
from asposewordscloud.models.fixed_page_save_options_data import FixedPageSaveOptionsData
7878
from asposewordscloud.models.font import Font
79+
from asposewordscloud.models.font_dto import FontDto
7980
from asposewordscloud.models.font_info import FontInfo
8081
from asposewordscloud.models.font_response import FontResponse
8182
from asposewordscloud.models.footnote import Footnote
@@ -162,8 +163,10 @@
162163
from asposewordscloud.models.protection_request import ProtectionRequest
163164
from asposewordscloud.models.ps_save_options_data import PsSaveOptionsData
164165
from asposewordscloud.models.range_document import RangeDocument
166+
from asposewordscloud.models.range_document_dto import RangeDocumentDto
165167
from asposewordscloud.models.range_text_response import RangeTextResponse
166168
from asposewordscloud.models.replace_range import ReplaceRange
169+
from asposewordscloud.models.replace_range_dto import ReplaceRangeDto
167170
from asposewordscloud.models.replace_text_parameters import ReplaceTextParameters
168171
from asposewordscloud.models.replace_text_response import ReplaceTextResponse
169172
from asposewordscloud.models.report_build_options import ReportBuildOptions
@@ -208,20 +211,26 @@
208211
from asposewordscloud.models.table import Table
209212
from asposewordscloud.models.table_cell import TableCell
210213
from asposewordscloud.models.table_cell_format import TableCellFormat
214+
from asposewordscloud.models.table_cell_format_dto import TableCellFormatDto
211215
from asposewordscloud.models.table_cell_format_response import TableCellFormatResponse
212216
from asposewordscloud.models.table_cell_insert import TableCellInsert
217+
from asposewordscloud.models.table_cell_insert_dto import TableCellInsertDto
213218
from asposewordscloud.models.table_cell_response import TableCellResponse
214219
from asposewordscloud.models.table_insert import TableInsert
220+
from asposewordscloud.models.table_insert_dto import TableInsertDto
215221
from asposewordscloud.models.table_link import TableLink
216222
from asposewordscloud.models.table_link_collection import TableLinkCollection
217223
from asposewordscloud.models.table_link_collection_response import TableLinkCollectionResponse
218224
from asposewordscloud.models.table_properties import TableProperties
225+
from asposewordscloud.models.table_properties_dto import TablePropertiesDto
219226
from asposewordscloud.models.table_properties_response import TablePropertiesResponse
220227
from asposewordscloud.models.table_response import TableResponse
221228
from asposewordscloud.models.table_row import TableRow
222229
from asposewordscloud.models.table_row_format import TableRowFormat
230+
from asposewordscloud.models.table_row_format_dto import TableRowFormatDto
223231
from asposewordscloud.models.table_row_format_response import TableRowFormatResponse
224232
from asposewordscloud.models.table_row_insert import TableRowInsert
233+
from asposewordscloud.models.table_row_insert_dto import TableRowInsertDto
225234
from asposewordscloud.models.table_row_response import TableRowResponse
226235
from asposewordscloud.models.tab_stop import TabStop
227236
from asposewordscloud.models.tab_stop_base import TabStopBase

asposewordscloud/api_client.py

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# coding: utf-8
22
# -----------------------------------------------------------------------------------
33
# <copyright company="Aspose" file="api_client.py">
4-
# Copyright (c) 2020 Aspose.Words for Cloud
4+
# Copyright (c) 2021 Aspose.Words for Cloud
55
# </copyright>
66
# <summary>
77
# Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -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': '20.11'}
84+
self.default_headers = {'x-aspose-client': 'python sdk', 'x-aspose-version': '21.1'}
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 20.11'
89+
self.user_agent = 'python sdk 21.1'
9090

9191
def __del__(self):
9292
self.pool.close()
@@ -153,7 +153,7 @@ def __call_api(
153153
self, resource_path, method,
154154
query_params=None, header_params=None, body=None, post_params=None,
155155
response_type=None, auth_settings=None,
156-
_return_http_data_only=None, collection_formats=None,
156+
collection_formats=None,
157157
_preload_content=True, _request_timeout=None):
158158
"""Call api method"""
159159
config = self.configuration
@@ -205,12 +205,7 @@ def __call_api(
205205

206206
self.last_response = response_data
207207

208-
return_data = self.deserialize(response_data.data, response_data.getheaders(), response_type)
209-
210-
if _return_http_data_only:
211-
return return_data
212-
return (return_data, response_data.status,
213-
response_data.getheaders())
208+
return response_data
214209

215210
def sanitize_for_serialization(self, obj):
216211
"""Builds a JSON POST object.
@@ -280,7 +275,7 @@ def deserialize_multipart(self, multipart, requests):
280275

281276
result = None
282277
if code == 200:
283-
if response_type is not None:
278+
if response_type is not 'None':
284279
result = self.deserialize(body, headers, response_type)
285280
else:
286281
result = rest.ApiException(status=code, reason=body.decode('UTF-8'))
@@ -361,7 +356,7 @@ def call_api(self, resource_path, method,
361356
query_params=None, header_params=None,
362357
body=None, post_params=None,
363358
response_type=None, auth_settings=None, is_async=None,
364-
_return_http_data_only=None, collection_formats=None,
359+
collection_formats=None,
365360
_preload_content=True, _request_timeout=None):
366361
"""Makes the HTTP request (synchronous) and returns deserialized data.
367362
@@ -380,8 +375,6 @@ def call_api(self, resource_path, method,
380375
:param files dict: key -> filename, value -> filepath,
381376
for `multipart/form-data`.
382377
:param is_async bool: execute request asynchronously
383-
:param _return_http_data_only: response data without head status code
384-
and headers
385378
:param collection_formats: dict of collection formats for path, query,
386379
header, and post parameters.
387380
:param _preload_content: if False, the urllib3.HTTPResponse object will
@@ -403,15 +396,14 @@ def call_api(self, resource_path, method,
403396
query_params, header_params,
404397
body, post_params,
405398
response_type, auth_settings,
406-
_return_http_data_only, collection_formats,
399+
collection_formats,
407400
_preload_content, _request_timeout)
408401
else:
409402
thread = self.pool.apply_async(self.__call_api, (resource_path,
410403
method, query_params,
411404
header_params, body,
412405
post_params,
413406
response_type, auth_settings,
414-
_return_http_data_only,
415407
collection_formats,
416408
_preload_content, _request_timeout))
417409
return thread

0 commit comments

Comments
 (0)