v2.8.7

Author: luoyanpeng-bytedancer

CHANGELOG.rst

@@ -1,5 +1,8 @@
 TOS SDK for Python 版本记录
 ===========================
+Version 2.8.7
+-------------
+- 修改:对Content-Encoding:gzip的数据不进行自动解压
 Version 2.8.6
 -------------
 - 新增:支持桶清单相关接口

tests/test_v2_object.py

@@ -1495,6 +1495,18 @@ def test_get_object_range(self):
         out_2 = self.client.get_object(bucket_name, key, range='bytes=1024-')
         self.assertEqual(out_2.read(), content[1024:])
 
+    def test_get_object_gzip(self):
+        bucket_name = self.bucket_name + 'object-gzip'
+        self.client.create_bucket(bucket_name)
+        self.bucket_delete.append(bucket_name)
+        key = self.random_key('.zp')
+        content = random_bytes(1024 * 1024)
+        self.client.put_object(bucket_name, key, content=content,content_encoding="gzip")
+        out = self.client.get_object(bucket_name, key, range='bytes=0-1023')
+        self.assertEqual(out.read(), content[0:1024])
+        out_2 = self.client.get_object(bucket_name, key, range='bytes=1024-')
+        self.assertEqual(out_2.read(), content[1024:])
+
     def test_copy_object_range(self):
         src_bucket_name = self.bucket_name + 'copy-object-range'
         key = self.random_key('.js')

tos/__version__.py

@@ -1 +1 @@
-__version__ = 'v2.8.6'
+__version__ = 'v2.8.7'

tos/clientv2.py

@@ -905,7 +905,7 @@ def __init__(self, ak='', sk='', endpoint='', region='',
                  enable_crc=True,
                  connection_time=10,
                  enable_verify_ssl=True,
-                 dns_cache_time=0,
+                 dns_cache_time=15,
                  proxy_host: str = None,
                  proxy_port: int = None,
                  proxy_username: str = None,
@@ -936,7 +936,7 @@ def __init__(self, ak='', sk='', endpoint='', region='',
         :param max_connections: 连接池中允许打开的最大 HTTP 连接数，默认 1024
         :param enable_crc: 是否开启上传后客户端 CRC 校验，默认为 true
         :param enable_verify_ssl: 是否开启 SSL 证书校验，默认为 true
-        :param dns_cache_time: DNS 缓存的有效期，单位：分钟，小于等于 0 时代表关闭 DNS 缓存，默认为 0
+        :param dns_cache_time: DNS 缓存的有效期，单位：分钟，小于等于 0 时代表关闭 DNS 缓存，默认为 15
         :param proxy_host: 代理服务器的主机地址，当前只支持 http 协议
         :param proxy_port: 代理服务器的端口
         :param proxy_username: 连接代理服务器时使用的用户名
@@ -2238,10 +2238,13 @@ def get_object_to_file(self, bucket: str, key: str, file_path: str,
         if os.path.isdir(file_path):
             file_path = os.path.join(file_path, key)
             try_make_file_dir(file_path)
+        tmp_file_path = file_path + ".temp."+str(uuid.uuid4())
 
-        with open(file_path, 'wb') as f:
+        with open(tmp_file_path, 'wb') as f:
             shutil.copyfileobj(result, f)
 
+        os.rename(tmp_file_path, file_path)
+
         return result
 
     def create_multipart_upload(self, bucket: str, key: str,

tos/http.py

@@ -34,6 +34,7 @@ def __init__(self, resp):
         self.request_id = self.headers.get('x-tos-request-id', '')
         self._all_read = False
         self.offset = 0
+        self.content_encoding = resp.headers.get('content-encoding',None)
 
     def __iter__(self):
         return self
@@ -54,8 +55,12 @@ def read(self, amt=None):
 
         if amt is None:
             content_list = []
-            for chunk in self.resp.iter_content(CHUNK_SIZE):
-                content_list.append(chunk)
+            if self.content_encoding and hasattr(self.resp.raw, "stream"):
+                for chunk in self.resp.raw.stream(CHUNK_SIZE, decode_content=False):
+                    content_list.append(chunk)
+            else:
+                for chunk in self.resp.iter_content(CHUNK_SIZE):
+                    content_list.append(chunk)
             content = b''.join(content_list)
 
             self._all_read = True
@@ -64,7 +69,10 @@ def read(self, amt=None):
             return content
         else:
             try:
-                read = next(self.resp.iter_content(amt))
+                if self.content_encoding and hasattr(self.resp.raw, "stream"):
+                    read = next(self.resp.raw.stream(amt, decode_content=False))
+                else:
+                    read = next(self.resp.iter_content(amt))
                 self.offset += len(read)
                 return read
             except StopIteration: