adjust format

xucooler · Feb 25, 2019 · 199a87f · 199a87f
1 parent 0be91dd
commit 199a87f
Show file tree

Hide file tree

Showing 21 changed files with 54 additions and 22 deletions.
diff --git a/examples/batch_copy.py b/examples/batch_copy.py
@@ -1,4 +1,7 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
+
 """
 批量拷贝文件
 

diff --git a/examples/batch_delete.py b/examples/batch_delete.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 批量删除文件
 

diff --git a/examples/batch_move.py b/examples/batch_move.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 批量移动文件
 

diff --git a/examples/batch_rename.py b/examples/batch_rename.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 批量重命名文件
 

diff --git a/examples/batch_stat.py b/examples/batch_stat.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 批量查询文件信息
 

diff --git a/examples/cdn_bandwidth.py b/examples/cdn_bandwidth.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 查询指定域名指定时间段内的带宽
 """

diff --git a/examples/cdn_flux.py b/examples/cdn_flux.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 查询指定域名指定时间段内的流量
 """

diff --git a/examples/cdn_log.py b/examples/cdn_log.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 获取指定域名指定时间内的日志链接
 """

diff --git a/examples/change_mime.py b/examples/change_mime.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 改变文件的mimeType
 """

diff --git a/examples/change_status.py b/examples/change_status.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 改变文件状态，可用或不可用
 """

diff --git a/examples/create_bucket.py b/examples/create_bucket.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 创建存储空间
 """

diff --git a/examples/list_buckets.py b/examples/list_buckets.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 列举账号下的空间
 """

diff --git a/examples/prefetch_to_cdn.py b/examples/prefetch_to_cdn.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
 
 """
 预取资源到cdn节点

diff --git a/examples/refresh_dirs.py b/examples/refresh_dirs.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 import qiniu
 from qiniu import CdnManager
 

diff --git a/examples/refresh_urls.py b/examples/refresh_urls.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 import qiniu
 from qiniu import CdnManager
 

diff --git a/examples/rtc_server.py b/examples/rtc_server.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
 
 from qiniu import QiniuMacAuth
 from qiniu import RtcServer, get_room_token

diff --git a/examples/timestamp_url.py b/examples/timestamp_url.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
 
 """
 获取一个配置时间戳防盗链的url

diff --git a/examples/update_cdn_sslcert.py b/examples/update_cdn_sslcert.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 更新cdn证书(可配合let's encrypt 等完成自动证书更新)
 """

diff --git a/qiniu/auth.py b/qiniu/auth.py
@@ -9,34 +9,33 @@
 from .compat import urlparse, json, b
 from .utils import urlsafe_base64_encode
 
-
 # 上传策略，参数规格详见
 # https://developer.qiniu.com/kodo/manual/1206/put-policy
 _policy_fields = set([
-    'callbackUrl',       # 回调URL
-    'callbackBody',      # 回调Body
-    'callbackHost',      # 回调URL指定的Host
+    'callbackUrl',  # 回调URL
+    'callbackBody',  # 回调Body
+    'callbackHost',  # 回调URL指定的Host
     'callbackBodyType',  # 回调Body的Content-Type
     'callbackFetchKey',  # 回调FetchKey模式开关
 
-    'returnUrl',         # 上传端的303跳转URL
-    'returnBody',        # 上传端简单反馈获取的Body
+    'returnUrl',  # 上传端的303跳转URL
+    'returnBody',  # 上传端简单反馈获取的Body
 
-    'endUser',           # 回调时上传端标识
-    'saveKey',           # 自定义资源名
-    'insertOnly',        # 插入模式开关
+    'endUser',  # 回调时上传端标识
+    'saveKey',  # 自定义资源名
+    'insertOnly',  # 插入模式开关
 
-    'detectMime',        # MimeType侦测开关
-    'mimeLimit',         # MimeType限制
-    'fsizeLimit',        # 上传文件大小限制
-    'fsizeMin',          # 上传文件最少字节数
+    'detectMime',  # MimeType侦测开关
+    'mimeLimit',  # MimeType限制
+    'fsizeLimit',  # 上传文件大小限制
+    'fsizeMin',  # 上传文件最少字节数
 
-    'persistentOps',        # 持久化处理操作
+    'persistentOps',  # 持久化处理操作
     'persistentNotifyUrl',  # 持久化处理结果通知URL
-    'persistentPipeline',   # 持久化处理独享队列
-    'deleteAfterDays',      # 文件多少天后自动删除
-    'fileType',             # 文件的存储类型，0为普通存储，1为低频存储
-    'isPrefixalScope'       # 指定上传文件必须使用的前缀
+    'persistentPipeline',  # 持久化处理独享队列
+    'deleteAfterDays',  # 文件多少天后自动删除
+    'fileType',  # 文件的存储类型，0为普通存储，1为低频存储
+    'isPrefixalScope'  # 指定上传文件必须使用的前缀
 ])
 
 

diff --git a/qiniu/services/storage/bucket.py b/qiniu/services/storage/bucket.py
@@ -3,7 +3,6 @@
 from qiniu import config
 from qiniu import http
 from qiniu.utils import urlsafe_base64_encode, entry
-import json
 
 
 class BucketManager(object):
@@ -239,8 +238,8 @@ def change_status(self, bucket, key, status, cond):
         resource = entry(bucket, key)
         if cond and isinstance(cond, dict):
             condstr = ""
-            for k,v in cond.items():
-                condstr+="{0}={1}&".format(k, v)
+            for k, v in cond.items():
+                condstr += "{0}={1}&".format(k, v)
             condstr = urlsafe_base64_encode(condstr[:-1])
             return self.__rs_do('chstatus', resource, 'status/{0}'.format(status), 'cond', condstr)
         return self.__rs_do('chstatus', resource, 'status/{0}'.format(status))

diff --git a/qiniu/services/storage/uploader.py b/qiniu/services/storage/uploader.py
@@ -211,7 +211,7 @@ def upload(self):
                 if config.get_default('default_zone').up_host_backup:
                     host = config.get_default('default_zone').up_host_backup
                 else:
-                    host = config.get_default('default_zone').get_up_host_backup_by_token(up_token)
+                    host = config.get_default('default_zone').get_up_host_backup_by_token(self.up_token)
             if info.need_retry() or crc != ret['crc32']:
                 ret, info = self.make_block(block, length, host)
                 if ret is None or crc != ret['crc32']: