Merge pull request #304 from tencentyun/feature_libertyzhu_b4da84dc

bugfix & optimization

Author: l-iberty

qcloud_cos/cos_client.py

@@ -806,7 +806,7 @@ def delete_object(self, Bucket, Key, **kwargs):
             method='DELETE',
             url=url,
             bucket=Bucket,
-            auth=CosS3Auth(self._conf, Key),
+            auth=CosS3Auth(self._conf, Key, params),
             headers=headers,
             params=params)
         data = dict(**rt.headers)
@@ -2680,11 +2680,8 @@ def put_bucket_domain_certificate(self, Bucket, DomainCertificateConfiguration,
         headers = mapped(kwargs)
         headers['Content-MD5'] = get_md5(xml_config)
         headers['Content-Type'] = 'application/xml'
-        # params = {'domaincertificate': ''}
-        # 目前 Domain Certificate API 不能使用 params 传递 query_string '?domaincertificate=',
-        # 只能将'?domaincertificate'拼接到url
+        params = {'domaincertificate': ''}
         url = self._conf.uri(bucket=Bucket)
-        url += '?domaincertificate'
         logger.info("put bucket domain certificate, url=:{url} ,headers=:{headers}".format(
             url=url,
             headers=headers))
@@ -2693,8 +2690,9 @@ def put_bucket_domain_certificate(self, Bucket, DomainCertificateConfiguration,
             url=url,
             bucket=Bucket,
             data=xml_config,
-            auth=CosS3Auth(self._conf),
-            headers=headers)
+            auth=CosS3Auth(self._conf, params=params),
+            headers=headers,
+            params=params)
         return None
 
     def get_bucket_domain_certificate(self, Bucket, DomainName, **kwargs):
@@ -2715,12 +2713,8 @@ def get_bucket_domain_certificate(self, Bucket, DomainName, **kwargs):
             )
         """
         headers = mapped(kwargs)
-        # 目前 Domain Certificate API 不能使用 params 传递 query_string '?domaincertificate=',
-        # 只能将'?domaincertificate'拼接到url
-        # params = {'domaincertificate': '', 'domainname': DomainName}
-        params = {'domainname': DomainName}
+        params = {'domaincertificate': '', 'domainname': DomainName}
         url = self._conf.uri(bucket=Bucket)
-        url += '?domaincertificate'
         logger.info("get bucket domain certificate, url=:{url} ,headers=:{headers}".format(
             url=url,
             headers=headers))
@@ -2752,12 +2746,8 @@ def delete_bucket_domain_certificate(self, Bucket, DomainName, **kwargs):
             )
         """
         headers = mapped(kwargs)
-        # 目前 Domain Certificate API 不能使用 params 传递 query_string '?domaincertificate=',
-        # 只能将'?domaincertificate'拼接到url
-        # params = {'domaincertificate': '', 'domainname': DomainName}
-        params = {'domainname': DomainName}
+        params = {'domaincertificate': '', 'domainname': DomainName}
         url = self._conf.uri(bucket=Bucket)
-        url += "?domaincertificate"
         logger.info("delete bucket domain certificate, url=:{url} ,headers=:{headers}".format(
             url=url,
             headers=headers))

qcloud_cos/resumable_downloader.py

@@ -3,6 +3,7 @@
 import json
 import os
 import sys
+import errno
 import threading
 import logging
 import uuid
@@ -45,7 +46,14 @@ def __init__(self, cos_client, bucket, key, dest_filename, object_info, part_siz
         self.__tmp_file = None
 
         if not os.path.exists(self.__dump_record_dir):
-            os.makedirs(self.__dump_record_dir)
+            # 多进程并发情况下makedirs会出现冲突, 需要进行异常捕获
+            try:
+                os.makedirs(self.__dump_record_dir)
+            except OSError as e:
+                if e.errno != errno.EEXIST:
+                    logger.error('os makedir error: dir: {0}, errno {1}'.format(self.__dump_record_dir), e.errno)
+                    raise
+                pass
         logger.debug('resumale downloader init finish, bucket: {0}, key: {1}'.format(bucket, key))
 
     def start(self):

setup.py

@@ -32,7 +32,7 @@ def long_description():
 
 
 setup(
-    name='cos-python-sdk-v5',
+    name='cos_python_sdk_v5', # comply with PEP 625
     version='1.9.34',
     url='https://www.qcloud.com/',
     license='MIT',