Merge pull request #83 from dt3310321/s3

S3

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

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):

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:

requirements.txt

@@ -1,3 +1,3 @@
-requests
+requests>=2.8
 dicttoxml
 six