Merge pull request #2 from qiniu/master

merge from master

Author: jemygraw

examples/timestamp_url.py

@@ -25,6 +25,3 @@
 timestamp_url = create_timestamp_anti_leech_url(host, file_name, query_string, encrypt_key, deadline)
 
 print(timestamp_url)
-
-
-

examples/upload_with_zone.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+
+from qiniu import Auth, put_file, etag, urlsafe_base64_encode
+import qiniu.config
+from qiniu import Zone, set_default
+
+# 需要填写你的 Access Key 和 Secret Key
+access_key = '...'
+secret_key = '...'
+
+# 构建鉴权对象
+q = Auth(access_key, secret_key)
+
+# 要上传的空间
+bucket_name = 'Bucket_Name'
+
+# 上传到七牛后保存的文件名
+key = 'my-python-logo.png';
+
+# 生成上传 Token，可以指定过期时间等
+token = q.upload_token(bucket_name, key, 3600)
+
+# 要上传文件的本地路径
+localfile = 'stat.py'
+
+# 指定固定的zone
+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)
+print(info)
+assert ret['key'] == key
+assert ret['hash'] == etag(localfile)

qiniu/__init__.py

@@ -9,7 +9,7 @@
 
 # flake8: noqa
 
-__version__ = '7.1.4'
+__version__ = '7.1.5'
 
 from .auth import Auth, QiniuMacAuth
 

qiniu/auth.py

@@ -36,6 +36,7 @@
     'persistentPipeline',   # 持久化处理独享队列
     'deleteAfterDays',      # 文件多少天后自动删除
     'fileType',             # 文件的存储类型，0为普通存储，1为低频存储
+    'isPrefixalScope'       # 指定上传文件必须使用的前缀
 ])
 
 

qiniu/zone.py

@@ -80,16 +80,16 @@ def get_bucket_hosts(self, ak, bucket):
         hosts[self.scheme].update({'up': []})
         hosts[self.scheme].update({'io': []})
 
-        if self.up_host != None:
+        if self.up_host is not None:
             hosts[self.scheme]['up'].append(self.scheme + "://" + self.up_host)
 
-        if self.up_host_backup != None:
+        if self.up_host_backup is not None:
             hosts[self.scheme]['up'].append(self.scheme + "://" + self.up_host_backup)
 
-        if self.io_host != None:
+        if self.io_host is not None:
             hosts[self.scheme]['io'].append(self.scheme + "://" + self.io_host)
 
-        if len(hosts[self.scheme]) == 0 or self.io_host == None:
+        if len(hosts[self.scheme]) == 0 or self.io_host is None:
             # print(hosts)
             hosts = compat.json.loads(self.bucket_hosts(ak, bucket))
         else: