diff --git a/qcloud_cos/cos_client.py b/qcloud_cos/cos_client.py index 11533155..54c8c36d 100644 --- a/qcloud_cos/cos_client.py +++ b/qcloud_cos/cos_client.py @@ -2163,6 +2163,8 @@ def _get_resumable_uploadid(self, bucket, key): :param key(string): 分块上传路径名. :return(string): 断点续传的uploadid,如果不存在则返回None. """ + if key and key[0] == '/': + key = key[1:] multipart_response = self.list_multipart_uploads( Bucket=bucket, Prefix=key diff --git a/qcloud_cos/cos_comm.py b/qcloud_cos/cos_comm.py index 5b644c62..388730e7 100644 --- a/qcloud_cos/cos_comm.py +++ b/qcloud_cos/cos_comm.py @@ -373,6 +373,8 @@ def check_object_content_length(data): def format_dict(data, key_lst): """转换返回dict中的可重复字段为list""" + if not (isinstance(data, dict) and isinstance(key_lst, list)): + return data for key in key_lst: # 将dict转为list,保持一致 if key in data and isinstance(data[key], dict): diff --git a/qcloud_cos/cos_threadpool.py b/qcloud_cos/cos_threadpool.py index 55293551..49f7acb8 100644 --- a/qcloud_cos/cos_threadpool.py +++ b/qcloud_cos/cos_threadpool.py @@ -36,7 +36,7 @@ def run(self): self._task_queue.task_done() def get_result(self): - return self._succ_task_num, self._fail_task_num, self._ret + return self._succ_task_num, self._fail_task_num, self._ret class SimpleThreadPool: diff --git a/requirements.txt b/requirements.txt index 98dbdc12..f3cea5c1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -requests +requests>=2.8 dicttoxml six