format

longbai · longbai · commit 63434df31667 · 2018-05-17T08:57:29.000+08:00
diff --git a/examples/batch.py b/examples/batch.py
@@ -4,7 +4,7 @@
 from qiniu import Auth
 from qiniu import BucketManager
 from qiniu import build_batch_copy
-from qiniu import build_batch_move,build_batch_rename
+from qiniu import build_batch_move, build_batch_rename
 
 access_key = '...'
 secret_key = '...'
diff --git a/examples/batch_copy.py b/examples/batch_copy.py
@@ -21,6 +21,10 @@
 target_bucket_name = ''
 
 # force为true时强制同名覆盖, 字典的键为原文件，值为目标文件
-ops = build_batch_copy(src_bucket_name, {'src_key1': 'target_key1', 'src_key2': 'target_key2'}, target_bucket_name, force='true')
+ops = build_batch_copy(src_bucket_name,
+                       {'src_key1': 'target_key1',
+                        'src_key2': 'target_key2'},
+                       target_bucket_name,
+                       force='true')
 ret, info = bucket.batch(ops)
 print(info)
diff --git a/examples/batch_move.py b/examples/batch_move.py
@@ -22,6 +22,10 @@
 target_bucket_name = ''
 
 # force为true时强制同名覆盖, 字典的键为原文件，值为目标文件
-ops = build_batch_move(src_bucket_name, {'src_key1': 'target_key1', 'src_key2': 'target_key2'}, target_bucket_name, force='true')
+ops = build_batch_move(src_bucket_name,
+                       {'src_key1': 'target_key1',
+                        'src_key2': 'target_key2'},
+                       target_bucket_name,
+                       force='true')
 ret, info = bucket.batch(ops)
 print(info)
diff --git a/examples/batch_rename.py b/examples/batch_rename.py
@@ -21,6 +21,8 @@
 
 
 # force为true时强制同名覆盖, 字典的键为原文件，值为目标文件
-ops = build_batch_rename(bucket_name, {'src_key1': 'target_key1', 'src_key2': 'target_key2'}, force='true')
+ops = build_batch_rename(
+    bucket_name, {
+        'src_key1': 'target_key1', 'src_key2': 'target_key2'}, force='true')
 ret, info = bucket.batch(ops)
 print(info)
diff --git a/examples/cdn_bandwidth.py b/examples/cdn_bandwidth.py
@@ -24,7 +24,8 @@
     'b.example.com'
 ]
 
-ret, info = cdn_manager.get_bandwidth_data(urls, startDate, endDate, granularity)
+ret, info = cdn_manager.get_bandwidth_data(
+    urls, startDate, endDate, granularity)
 
 print(ret)
 print(info)
diff --git a/examples/delete_afte_days.py b/examples/delete_afte_days.py
@@ -22,5 +22,3 @@
 
 ret, info = bucket.delete_after_days(bucket_name, key, days)
 print(info)
-
-
diff --git a/examples/fops.py b/examples/fops.py
@@ -19,7 +19,7 @@
 
 # 可以对转码后的文件进行使用saveas参数自定义命名，当然也可以不指定文件会默认命名并保存在当前空间
 saveas_key = urlsafe_base64_encode('目标Bucket_Name:自定义文件key')
-fops = fops+'|saveas/'+saveas_key
+fops = fops + '|saveas/' + saveas_key
 ops = []
 pfop = PersistentFop(q, bucket_name, pipeline)
 
diff --git a/examples/pfop_vframe.py b/examples/pfop_vframe.py
@@ -19,11 +19,11 @@
 
 # 可以对转码后的文件进行使用saveas参数自定义命名，当然也可以不指定文件会默认命名并保存在当前空间
 saveas_key = urlsafe_base64_encode('目标Bucket_Name:自定义文件key')
-fops = fops+'|saveas/'+saveas_key
+fops = fops + '|saveas/' + saveas_key
 
 pfop = PersistentFop(q, bucket, pipeline)
 ops = []
 ops.append(fops)
 ret, info = pfop.execute(key, ops, 1)
 print(info)
-assert ret['persistentId'] is not None
+assert ret['persistentId'] is not None
diff --git a/examples/pfop_watermark.py b/examples/pfop_watermark.py
@@ -15,17 +15,18 @@
 pipeline = 'pipeline_name'
 
 # 需要添加水印的图片UrlSafeBase64,可以参考http://developer.qiniu.com/code/v6/api/dora-api/av/video-watermark.html
-base64URL = urlsafe_base64_encode('http://developer.qiniu.com/resource/logo-2.jpg')
+base64URL = urlsafe_base64_encode(
+    'http://developer.qiniu.com/resource/logo-2.jpg')
 
 # 视频水印参数
-fops = 'avthumb/mp4/'+base64URL
+fops = 'avthumb/mp4/' + base64URL
 
 # 可以对转码后的文件进行使用saveas参数自定义命名，当然也可以不指定文件会默认命名并保存在当前空间
 saveas_key = urlsafe_base64_encode('目标Bucket_Name:自定义文件key')
-fops = fops+'|saveas/'+saveas_key
+fops = fops + '|saveas/' + saveas_key
 ops = []
 pfop = PersistentFop(q, bucket, pipeline)
 ops.append(fops)
 ret, info = pfop.execute(key, ops, 1)
 print(info)
-assert ret['persistentId'] 
+assert ret['persistentId']
diff --git a/examples/rtc_server.py b/examples/rtc_server.py
@@ -77,7 +77,8 @@
     "appId": "<AppID>:必填",  # AppID: 房间所属帐号的 app 。
     "roomName": "<房间名>:必填",  # RoomName: 房间名称，需满足规格 ^[a-zA-Z0-9_-]{3,64}$
     "userId": "<用户名>:必填",  # UserID: 请求加入房间的用户 ID，需满足规格 ^[a-zA-Z0-9_-]{3,50}$
-    "expireAt": int(time.time()) + 3600,  # ExpireAt: int64 类型，鉴权的有效时间，传入以秒为单位的64位Unix绝对时间，
+    # ExpireAt: int64 类型，鉴权的有效时间，传入以秒为单位的64位Unix绝对时间，
+    "expireAt": int(time.time()) + 3600,
     # token 将在该时间后失效。
     "permission": "user"  # 该用户的房间管理权限，"admin" 或 "user"，默认为 "user" 。当权限角色为 "admin" 时，
     # 拥有将其他用户移除出房间等特权.
diff --git a/examples/timestamp_url.py b/examples/timestamp_url.py
@@ -19,9 +19,10 @@
 query_string = ''
 
 # 截止日期的时间戳,秒为单位，3600为当前时间一小时之后过期
-deadline = int(time.time())+3600
+deadline = int(time.time()) + 3600
 
 
-timestamp_url = create_timestamp_anti_leech_url(host, file_name, query_string, encrypt_key, deadline)
+timestamp_url = create_timestamp_anti_leech_url(
+    host, file_name, query_string, encrypt_key, deadline)
 
 print(timestamp_url)
diff --git a/examples/update_cdn_sslcert.py b/examples/update_cdn_sslcert.py
@@ -14,16 +14,17 @@
 
 privatekey = "ssl/www.qiniu.com/privkey.pem"
 ca = "ssl/www.qiniu.com/fullchain.pem"
-domain_name='www.qiniu.com'
+domain_name = 'www.qiniu.com'
 
-with open(privatekey,'r') as f:
-    privatekey_str=f.read()
+with open(privatekey, 'r') as f:
+    privatekey_str = f.read()
 
-with open(ca,'r') as f:
-    ca_str=f.read()
+with open(ca, 'r') as f:
+    ca_str = f.read()
 
-ret, info = domain_manager.create_sslcert(domain_name, domain_name, privatekey_str, ca_str)
+ret, info = domain_manager.create_sslcert(
+    domain_name, domain_name, privatekey_str, ca_str)
 print(ret['certID'])
 
-ret, info = domain_manager.put_httpsconf(domain_name, ret['certID'],False)
+ret, info = domain_manager.put_httpsconf(domain_name, ret['certID'], False)
 print(info)
diff --git a/examples/upload_callback.py b/examples/upload_callback.py
@@ -12,11 +12,11 @@
 
 key = 'my-python-logo.png'
 
-#上传文件到七牛后， 七牛将文件名和文件大小回调给业务服务器。
+# 上传文件到七牛后， 七牛将文件名和文件大小回调给业务服务器。
 policy = {
- 'callbackUrl': 'http://your.domain.com/callback.php',
- 'callbackBody': 'filename=$(fname)&filesize=$(fsize)'
- }
+    'callbackUrl': 'http://your.domain.com/callback.php',
+    'callbackBody': 'filename=$(fname)&filesize=$(fsize)'
+}
 
 token = q.upload_token(bucket_name, key, 3600, policy)
 
@@ -26,4 +26,3 @@
 print(info)
 assert ret['key'] == key
 assert ret['hash'] == etag(localfile)
-
diff --git a/examples/upload_pfops.py b/examples/upload_pfops.py
@@ -21,13 +21,13 @@
 # 通过添加'|saveas'参数，指定处理后的文件保存的bucket和key，不指定默认保存在当前空间，bucket_saved为目标bucket，bucket_saved为目标key
 saveas_key = urlsafe_base64_encode('bucket_saved:bucket_saved')
 
-fops = fops+'|saveas/'+saveas_key
+fops = fops + '|saveas/' + saveas_key
 
 # 在上传策略中指定fobs和pipeline
 policy = {
-  'persistentOps': fops,
-  'persistentPipeline': pipeline
- }
+    'persistentOps': fops,
+    'persistentPipeline': pipeline
+}
 
 token = q.upload_token(bucket_name, key, 3600, policy)
 
diff --git a/examples/upload_token.py b/examples/upload_token.py
@@ -3,30 +3,29 @@
 
 from qiniu import Auth
 
-#需要填写你的 Access Key 和 Secret Key
+# 需要填写你的 Access Key 和 Secret Key
 access_key = ''
 secret_key = ''
 
-#构建鉴权对象
+# 构建鉴权对象
 q = Auth(access_key, secret_key)
 
-#要上传的空间
+# 要上传的空间
 bucket_name = ''
 
-#上传到七牛后保存的文件名
+# 上传到七牛后保存的文件名
 key = ''
 
-#生成上传 Token，可以指定过期时间等
+# 生成上传 Token，可以指定过期时间等
 
 # 上传策略示例
 # https://developer.qiniu.com/kodo/manual/1206/put-policy
 policy = {
- # 'callbackUrl':'https://requestb.in/1c7q2d31',
- # 'callbackBody':'filename=$(fname)&filesize=$(fsize)'
- # 'persistentOps':'imageView2/1/w/200/h/200'
- }
+    # 'callbackUrl':'https://requestb.in/1c7q2d31',
+    # 'callbackBody':'filename=$(fname)&filesize=$(fsize)'
+    # 'persistentOps':'imageView2/1/w/200/h/200'
+}
 
 token = q.upload_token(bucket_name, key, 3600, policy)
 
 print(token)
-
diff --git a/examples/upload_with_zone.py b/examples/upload_with_zone.py
@@ -16,7 +16,7 @@
 bucket_name = 'Bucket_Name'
 
 # 上传到七牛后保存的文件名
-key = 'my-python-logo.png';
+key = 'my-python-logo.png'
 
 # 生成上传 Token，可以指定过期时间等
 token = q.upload_token(bucket_name, key, 3600)
@@ -25,7 +25,11 @@
 localfile = 'stat.py'
 
 # 指定固定的zone
-zone = Zone(up_host='uptest.qiniu.com', up_host_backup='uptest.qiniu.com', io_host='iovip.qbox.me', scheme='http')
+zone = Zone(
+    up_host='uptest.qiniu.com',
+    up_host_backup='uptest.qiniu.com',
+    io_host='iovip.qbox.me',
+    scheme='http')
 set_default(default_zone=zone)
 
 ret, info = put_file(token, key, localfile)
diff --git a/qiniu/__init__.py b/qiniu/__init__.py
@@ -19,7 +19,7 @@
 from .services.storage.bucket import BucketManager, build_batch_copy, build_batch_rename, build_batch_move, \
     build_batch_stat, build_batch_delete
 from .services.storage.uploader import put_data, put_file, put_stream
-from .services.cdn.manager import CdnManager, create_timestamp_anti_leech_url,DomainManager
+from .services.cdn.manager import CdnManager, create_timestamp_anti_leech_url, DomainManager
 from .services.processing.pfop import PersistentFop
 from .services.processing.cmd import build_op, pipe_cmd, op_save
 from .services.compute.app import AccountClient
diff --git a/qiniu/auth.py b/qiniu/auth.py
@@ -69,7 +69,8 @@ def token(self, data):
 
     def token_with_data(self, data):
         data = urlsafe_base64_encode(data)
-        return '{0}:{1}:{2}'.format(self.__access_key, self.__token(data), data)
+        return '{0}:{1}:{2}'.format(
+            self.__access_key, self.__token(data), data)
 
     def token_of_request(self, url, body=None, content_type=None):
         """带请求体的签名（本质上是管理凭证的签名）
@@ -124,7 +125,13 @@ def private_download_url(self, url, expires=3600):
         token = self.token(url)
         return '{0}&token={1}'.format(url, token)
 
-    def upload_token(self, bucket, key=None, expires=3600, policy=None, strict_policy=True):
+    def upload_token(
+            self,
+            bucket,
+            key=None,
+            expires=3600,
+            policy=None,
+            strict_policy=True):
         """生成上传凭证
 
         Args:
@@ -157,7 +164,12 @@ def __upload_token(self, policy):
         data = json.dumps(policy, separators=(',', ':'))
         return self.token_with_data(data)
 
-    def verify_callback(self, origin_authorization, url, body, content_type='application/x-www-form-urlencoded'):
+    def verify_callback(
+            self,
+            origin_authorization,
+            url,
+            body,
+            content_type='application/x-www-form-urlencoded'):
         """回调验证
 
         Args:
@@ -186,7 +198,8 @@ def __init__(self, auth):
 
     def __call__(self, r):
         if r.body is not None and r.headers['Content-Type'] == 'application/x-www-form-urlencoded':
-            token = self.auth.token_of_request(r.url, r.body, 'application/x-www-form-urlencoded')
+            token = self.auth.token_of_request(
+                r.url, r.body, 'application/x-www-form-urlencoded')
         else:
             token = self.auth.token_of_request(r.url)
         r.headers['Authorization'] = 'QBox {0}'.format(token)
@@ -215,7 +228,14 @@ def __token(self, data):
         hashed = hmac.new(self.__secret_key, data, sha1)
         return urlsafe_base64_encode(hashed.digest())
 
-    def token_of_request(self, method, host, url, qheaders, content_type=None, body=None):
+    def token_of_request(
+            self,
+            method,
+            host,
+            url,
+            qheaders,
+            content_type=None,
+            body=None):
         """
         <Method> <PathWithRawQuery>
         Host: <Host>
@@ -236,7 +256,9 @@ def token_of_request(self, method, host, url, qheaders, content_type=None, body=
         path_with_query = path
         if query != '':
             path_with_query = ''.join([path_with_query, '?', query])
-        data = ''.join(["%s %s" % (method, path_with_query), "\n", "Host: %s" % host, "\n"])
+        data = ''.join(["%s %s" %
+                        (method, path_with_query), "\n", "Host: %s" %
+                        host, "\n"])
 
         if content_type:
             data += "Content-Type: %s" % (content_type) + "\n"
@@ -253,7 +275,7 @@ def qiniu_headers(self, headers):
         res = ""
         for key in headers:
             if key.startswith(self.qiniu_header_prefix):
-                res += key+": %s\n" % (headers.get(key))
+                res += key + ": %s\n" % (headers.get(key))
         return res
 
     @staticmethod
@@ -272,6 +294,6 @@ def __call__(self, r):
             r.url, self.auth.qiniu_headers(r.headers),
             r.headers.get('Content-Type', None),
             r.body
-            )
+        )
         r.headers['Authorization'] = 'Qiniu {0}'.format(token)
         return r
diff --git a/qiniu/http.py b/qiniu/http.py
diff --git a/qiniu/main.py b/qiniu/main.py
diff --git a/qiniu/utils.py b/qiniu/utils.py
diff --git a/qiniu/zone.py b/qiniu/zone.py

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@`
`24`	`24`	`'b.example.com'`
`25`	`25`	`]`
`26`	`26`
`27`		`-ret, info = cdn_manager.get_bandwidth_data(urls, startDate, endDate, granularity)`
	`27`	`+ret, info = cdn_manager.get_bandwidth_data(`
	`28`	`+ urls, startDate, endDate, granularity)`
`28`	`29`
`29`	`30`	`print(ret)`
`30`	`31`	`print(info)`