Merge pull request #179 from zhy1985555/master

使用coscmd+全球加速时报错
tencentyun · Oct 13, 2021 · 25a60bf · 25a60bf
2 parents 79f35de + 1b09ac8
commit 25a60bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/qcloud_cos/cos_client.py b/qcloud_cos/cos_client.py
@@ -93,8 +93,11 @@ 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
-        # 格式化ci的endpoint 不支持自定义域名的
-        self._endpoint_ci = format_endpoint(EndpointCi, Region, u'ci.')
+
+        # 客户使用全球加速域名时，只会传endpoint不会传region。此时这样endpointCi和region同时为None，就会报错。
+        if EndpointCi is not None:
+            # 格式化ci的endpoint 不支持自定义域名的
+            self._endpoint_ci = format_endpoint(EndpointCi, Region, u'ci.')
 
         # 兼容(SecretId,SecretKey)以及(AccessId,AccessKey)
         if (SecretId and SecretKey):

diff --git a/qcloud_cos/version.py b/qcloud_cos/version.py
@@ -1 +1 @@
-__version__ = '5.1.9.9'
+__version__ = '5.1.9.10'
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@ def long_description():
 
 setup(
     name='cos-python-sdk-v5',
-    version='1.9.9',
+    version='1.9.10',
     url='https://www.qcloud.com/',
     license='MIT',
     author='tiedu, lewzylu, channingliu',