From e04d30783be97f04a71b35888bcb012906bc9de8 Mon Sep 17 00:00:00 2001 From: yuniszhang Date: Fri, 5 Nov 2021 18:52:14 +0800 Subject: [PATCH 1/2] modify restore_object response --- qcloud_cos/cos_client.py | 4 ++-- qcloud_cos/version.py | 2 +- setup.py | 2 +- ut/test.py | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/qcloud_cos/cos_client.py b/qcloud_cos/cos_client.py index 646f5d3f..068719a8 100644 --- a/qcloud_cos/cos_client.py +++ b/qcloud_cos/cos_client.py @@ -1128,7 +1128,7 @@ def restore_object(self, Bucket, Key, RestoreRequest={}, **kwargs): auth=CosS3Auth(self._conf, Key, params=params), headers=headers, params=params) - return rt + return None def select_object_content(self, Bucket, Key, Expression, ExpressionType, InputSerialization, OutputSerialization, RequestProgress=None, **kwargs): @@ -2400,7 +2400,7 @@ def put_bucket_domain(self, Bucket, DomainConfiguration={}, **kwargs): auth=CosS3Auth(self._conf, params=params), headers=headers, params=params) - return rt + return None def get_bucket_domain(self, Bucket, **kwargs): """获取bucket 自定义域名配置 diff --git a/qcloud_cos/version.py b/qcloud_cos/version.py index e8fd574e..baed5548 100644 --- a/qcloud_cos/version.py +++ b/qcloud_cos/version.py @@ -1 +1 @@ -__version__ = '5.1.9.10' +__version__ = '5.1.9.11' diff --git a/setup.py b/setup.py index 6089a3f7..9504f63d 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ def long_description(): setup( name='cos-python-sdk-v5', - version='1.9.10', + version='1.9.11', url='https://www.qcloud.com/', license='MIT', author='tiedu, lewzylu, channingliu', diff --git a/ut/test.py b/ut/test.py index 764237ea..7a019100 100644 --- a/ut/test.py +++ b/ut/test.py @@ -1785,8 +1785,6 @@ def test_sse_c_file(): 'Tier': 'Expedited' } }, SSECustomerAlgorithm='AES256', SSECustomerKey=ssec_key, SSECustomerKeyMD5=ssec_key_md5) - print(response) - assert(response.status_code == 202) # 测试大文件高级上传，走多段 gen_file('sdk-sse-c-big.local', 21) From 815ba00b76cd2be88d7476b52b2cf4e5339680bb Mon Sep 17 00:00:00 2001 From: yuniszhang Date: Mon, 8 Nov 2021 11:43:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3CI=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E9=BB=98=E8=AE=A4=E5=88=9D=E5=A7=8B=E5=8C=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qcloud_cos/cos_client.py | 8 +++----- qcloud_cos/cos_comm.py | 12 ++++++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/qcloud_cos/cos_client.py b/qcloud_cos/cos_client.py index 068719a8..6b50449d 100644 --- a/qcloud_cos/cos_client.py +++ b/qcloud_cos/cos_client.py @@ -94,11 +94,9 @@ def __init__(self, Appid=None, Region=None, SecretId=None, SecretKey=None, Token if (Scheme != u'http' and Scheme != u'https'): raise CosClientError('Scheme can be only set to http/https') self._scheme = Scheme - - # 客户使用全球加速域名时，只会传endpoint不会传region。此时这样endpointCi和region同时为None，就会报错。 - if EndpointCi is not None: - # 格式化ci的endpoint 不支持自定义域名的 - self._endpoint_ci = format_endpoint(EndpointCi, Region, u'ci.') + + # 格式化ci的endpoint 不支持自定义域名的 + self._endpoint_ci = format_endpoint(EndpointCi, Region, u'ci.') # 兼容(SecretId,SecretKey)以及(AccessId,AccessKey) if (SecretId and SecretKey): diff --git a/qcloud_cos/cos_comm.py b/qcloud_cos/cos_comm.py index 92ec0311..35cb9acc 100644 --- a/qcloud_cos/cos_comm.py +++ b/qcloud_cos/cos_comm.py @@ -221,14 +221,18 @@ def format_values(data): def format_endpoint(endpoint, region, module=u'cos.'): - """格式化终端域名""" - if not endpoint and not region: + # 客户使用全球加速域名时，只会传endpoint不会传region。此时这样endpointCi和region同时为None，就会报错。 + if not endpoint and not region and module == u'cos.': raise CosClientError("Region or Endpoint is required not empty!") - if not endpoint: + + """格式化终端域名""" + if endpoint: + return to_unicode(endpoint) + elif region: region = format_region(region, module) return u"{region}.myqcloud.com".format(region=region) else: - return to_unicode(endpoint) + return None def format_region(region, module=u'cos.'):