Merge pull request #128 from jayzhenghan/master

fix python style

Author: dt3310321

.travis.yml

@@ -10,6 +10,7 @@ install:
 - pip install nose
 - pip install pycodestyle
 - pip install dicttoxml
+- pip install crcmod
 notifications:
   email:
     recipients:

qcloud_cos/.travis.yml

@@ -0,0 +1,31 @@
+sudo: false
+language: python
+python:
+- '2.7'
+- '3.5'
+- '3.6'
+install:
+- pip install requests
+- pip install six
+- pip install nose
+- pip install pycodestyle
+- pip install dicttoxml
+- pip install crcmod
+notifications:
+  email:
+    recipients:
+      - wjielai@tencent.com
+      - fysntian@tencent.com
+script:
+- pycodestyle --max-line-length=200 qcloud_cos/.
+- nosetests -s -v ut/
+deploy:
+  provider: pypi
+  distributions: sdist bdist_wheel
+  user: dt3310321
+  password:
+    secure: JCBE84C22lHElRm7HmIf//UI123EuiFznEFPoVMPlRGb/XBrtYb+x1SRaO7Dn165CfVDpXtdNbJYfD9s2p3FUKzxSqkwl7FkkSl2g1jwKO97gKBPGxozBN+9pOJLTQUXBwON+erJSpMCHxrUjKKZBi56mUYXPP+A1X8sIHFMF4rLdPSuobjx0VGm2qFWhFeuLFPNOfF5ZKQDCnieptBLhrMXRcxyhZja/HsQh/JOjnMKZAmgJep2w2hI7ScYeTF0Ljk3RQbSN88HjZ7XP+U3bhiy5IE2u0WhJr6Q1OwxIuw8EIP+5mBNELT8Q5AMDnR85ehOVf67nl8j0nCiLzS55t1wuFHWExwW4kKF0dLpeV/fj3huFwQuAYItgZzCA/h3Fne6D3omjknd1uvWcUQzzXU1ixdeuq8XoDYxF8eox3GWQ/jbZY8lLXQ1BhaMK5E/MY8DJs1S+i6I1mJ34rCcnRYS1R3zZAJryaFxI6UsEAniXu4ESI+da7KD4y4TC0hY4RlcFyqQ0OVeeXoclQytRfgIT+EPZHt1mAr8qinmy5K2GoVcWwEj54AXp4LwiOosve6vqdeXjR/EeGy3zWjEfhn5B4z8UMLyGS/S1k3rSpV85KB4nLuzKGlyUkC2sjGr/xiG7CBC1UCbqx1CGLlCZ/HvEmKvuSrbJNbsgBNU/og=
+  on:
+    tags: true
+    branch: master
+

qcloud_cos/cos_client.py

@@ -2947,7 +2947,7 @@ def _check_all_upload_parts(self, bucket, key, uploadid, local_path, parts_num,
 
     def download_file(self, Bucket, Key, DestFilePath, PartSize=20, MAZThread=5, EnableCRC=False, **Kwargs):
         """小于等于20MB的文件简单下载，大于20MB的文件使用续传下载
-        
+
         :param Bucket(string): 存储桶名称.
         :param key(string): COS文件的路径名.
         :param DestFilePath(string): 下载文件的目的路径.
@@ -2956,9 +2956,9 @@ def download_file(self, Bucket, Key, DestFilePath, PartSize=20, MAZThread=5, Ena
         :param EnableCRC(bool): 校验下载文件与源文件是否一致
         :param kwargs(dict): 设置请求headers.
         """
-        logger.debug("Start to download file, bucket: {0}, key: {1}, dest_filename: {2}, part_size: {3}MB, "
-                    "max_thread: {4}".format(Bucket, Key, DestFilePath, PartSize, MAZThread))
-        
+        logger.debug("Start to download file, bucket: {0}, key: {1}, dest_filename: {2}, part_size: {3}MB,\
+                     max_thread: {4}".format(Bucket, Key, DestFilePath, PartSize, MAZThread))
+
         object_info = self.head_object(Bucket, Key)
         file_size = object_info['Content-Length']
         if file_size <= 1024*1024*20:

qcloud_cos/resumable_downloader.py

@@ -13,6 +13,7 @@
 from .cos_threadpool import SimpleThreadPool
 logger = logging.getLogger(__name__)
 
+
 class ResumableDownLoader(object):
     def __init__(self, cos_client, bucket, key, dest_filename, object_info, part_size=20, max_thread=5, enable_crc=False, **kwargs):
         self.__cos_client = cos_client
@@ -24,26 +25,25 @@ def __init__(self, cos_client, bucket, key, dest_filename, object_info, part_siz
         self.__enable_crc = enable_crc
         self.__headers = kwargs
 
-        self.__max_part_count = 100 # 取决于服务端是否对并发有限制
-        self.__min_part_size = 1024 * 1024 # 1M
+        self.__max_part_count = 100  # 取决于服务端是否对并发有限制
+        self.__min_part_size = 1024 * 1024  # 1M
         self.__part_size = self.__determine_part_size_internal(int(object_info['Content-Length']), part_size)
         self.__finished_parts = []
         self.__lock = threading.Lock()
-        self.__record = None #记录当前的上下文
+        self.__record = None  # 记录当前的上下文
         self.__dump_record_dir = os.path.join(os.path.expanduser('~'), '.cos_download_tmp_file')
-        
+
         record_filename = self.__get_record_filename(bucket, key, self.__dest_file_path)
-        self.__record_filepath = os.path.join(self.__dump_record_dir, record_filename) 
+        self.__record_filepath = os.path.join(self.__dump_record_dir, record_filename)
         self.__tmp_file = None
 
         if not os.path.exists(self.__dump_record_dir):
             os.makedirs(self.__dump_record_dir)
-        
         logger.debug('resumale downloader init finish, bucket: {0}, key: {1}'.format(bucket, key))
 
     def start(self):
         logger.debug('start resumable downloade, bucket: {0}, key: {1}'.format(self.__bucket, self.__key))
-        self.__load_record() # 从record文件中恢复读取上下文
+        self.__load_record()  # 从record文件中恢复读取上下文
 
         assert self.__tmp_file
         open(self.__tmp_file, 'a').close()
@@ -78,10 +78,10 @@ def __get_record_filename(self, bucket, key, dest_file_path):
         return '{0}_{1}.{2}'.format(bucket, key_md5, dest_file_path_md5)
 
     def __determine_part_size_internal(self, file_size, part_size):
-        real_part_size = part_size * 1024 * 1024 # MB
+        real_part_size = part_size * 1024 * 1024  # MB
         if real_part_size < self.__min_part_size:
             real_part_size = self.__min_part_size
-        
+
         while real_part_size * self.__max_part_count < file_size:
             real_part_size = real_part_size * 2
         logger.debug('finish to determine part size, file_size: {0}, part_size: {1}'.format(file_size, real_part_size))
@@ -123,33 +123,29 @@ def __download_part(self, part, headers):
             result["Body"].pget_stream_to_file(f, part.start, part.length)
 
         self.__finish_part(part)
-    
+
     def __finish_part(self, part):
         logger.debug('download part finished,bucket: {0}, key: {1}, part_id: {2}'.
                      format(self.__bucket, self.__key, part.part_id))
         with self.__lock:
             self.__finished_parts.append(part)
-            self.__record['parts'].append({'part_id': part.part_id,
-                                           'start': part.start,
-                                           'length': part.length})
+            self.__record['parts'].append({'part_id': part.part_id, 'start': part.start, 'length': part.length})
             self.__dump_record(self.__record)
 
-    def __dump_record(self, record):       
+    def __dump_record(self, record):
         with open(self.__record_filepath, 'w') as f:
             json.dump(record, f)
-            logger.debug('dump record to {0}, bucket: {1}, key: {2}'.
-                         format(self.__record_filepath, self.__bucket, self.__key))
+            logger.debug('dump record to {0}, bucket: {1}, key: {2}'.format(self.__record_filepath, self.__bucket, self.__key))
 
     def __load_record(self):
         record = None
 
         if os.path.exists(self.__record_filepath):
             with open(self.__record_filepath, 'r') as f:
                 record = json.load(f)
-
             ret = self.__check_record(record)
             # record记录是否跟head object的一致，不一致则删除
-            if ret == False:   
+            if not ret:
                 self.__del_record()
                 record = None
             else:
@@ -166,9 +162,9 @@ def __load_record(self):
 
         if not record:
             self.__tmp_file = "{file_name}_{uuid}".format(file_name=self.__dest_file_path, uuid=uuid.uuid4().hex)
-            record = {'bucket': self.__bucket, 'key': self.__key, 'tmp_filename':self.__tmp_file,
-                      'mtime':self.__object_info['Last-Modified'], 'etag':self.__object_info['ETag'],
-                      'file_size':self.__object_info['Content-Length'], 'part_size': self.__part_size, 'parts':[]}
+            record = {'bucket': self.__bucket, 'key': self.__key, 'tmp_filename': self.__tmp_file,
+                      'mtime': self.__object_info['Last-Modified'], 'etag': self.__object_info['ETag'],
+                      'file_size': self.__object_info['Content-Length'], 'part_size': self.__part_size, 'parts': []}
             self.__record = record
             self.__dump_record(record)
 
@@ -184,12 +180,13 @@ def __del_record(self):
     def __check_crc(self):
         logger.debug('start to check crc')
         c64 = crcmod.mkCrcFun(0x142F0E1EBA9EA3693L, initCrc=0L, xorOut=0xffffffffffffffffL, rev=True)
-        with open(self.__dest_file_path,'rb') as f:
+        with open(self.__dest_file_path, 'rb') as f:
             local_crc64 = str(c64(f.read()))
         object_crc64 = self.__object_info['x-cos-hash-crc64ecma']
         if local_crc64 is not None and object_crc64 is not None and local_crc64 != object_crc64:
             raise CosClientError('crc of client: {0} is mismatch with cos: {1}'.format(local_crc64, object_crc64))
 
+
 class PartInfo(object):
     def __init__(self, part_id, start, length):
         self.part_id = part_id

qcloud_cos/streambody.py

@@ -67,7 +67,7 @@ def pget_stream_to_file(self, fdst, offset, expected_len, auto_decompress=False)
             use_encoding = True
         read_len = 0
         fdst.seek(offset, 0)
-        
+
         if use_encoding and not auto_decompress:
             chunk = self._rt.raw.read(1024)
             while chunk:
@@ -80,7 +80,5 @@ def pget_stream_to_file(self, fdst, offset, expected_len, auto_decompress=False)
                     read_len += len(chunk)
                     fdst.write(chunk)
 
-        
         if not use_chunked and not (use_encoding and auto_decompress) and read_len != expected_len:
             raise IOError("download failed with incomplete file")
-