Merge pull request #322 from bernieyangmh/master

longbai · web-flow · commit eb23e47587dc · 2019-02-25T16:26:30.000+08:00
add qvm annotate
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 sudo: false
 language: python
 python:
-- '2.6.9'
+- 2.6.9
 - '2.7'
 - '3.4'
 - '3.5'
@@ -17,13 +17,13 @@ before_script:
 - export QINIU_TEST_ENV="travis"
 - export PYTHONPATH="$PYTHONPATH:."
 script:
-- if [[ "$TRAVIS_PYTHON_VERSION" != "2.6.9" ]]; then flake8 --show-source --max-line-length=160 .; fi
+- if [[ "$TRAVIS_PYTHON_VERSION" != "2.6.9" ]]; then flake8 --show-source --max-line-length=160
+  .; fi
 - py.test --cov qiniu
-- if [[ "$TRAVIS_PYTHON_VERSION" != "2.6.9" ]]; then ocular --data-file .coverage; fi
-deploy:
-  provider: pypi
-  user: qiniusdk
-  password:
-    secure: N2u9xzhncbziIhoDdpaCcr7D3lW/N7AOIZDpx+M5QW0lPqIXkZDioOTZ7b4QNwx/XFMu6tdeK79A2Wg7T9/8VfEWDd2bYL7a1J7spoFJi9k3HVHHiFBmg7vXr1OGn3D51xqsrq3Kh9uRP150a5CA2qxYabKb6b6dn5QhOTPhfFY=
-  on:
-    tags: true
+- if [[ "$TRAVIS_PYTHON_VERSION" != "2.6.9" ]]; then ocular --data-file .coverage;
+  fi
+
+env:
+  global:
+    secure: McZuxM4UAKabtGvCi+t1F/Spb/3Yzb6O7hEk0JLwJEYCnl7hkfV1ogAgjjYdHwkNPjOwUaz3rpdmahz64ohtpucPsIyQjgK7tigTM+UgdAcg77RflB50yJ3yCnJOHMxVRF0RNLZqFeuf3GkfnOyzZFynN+LmM5n+0/iIuC4LXgs=
+    QINIU_ACCESS_KEY=vHg2e7nOh7Jsucv2Azr5FH6omPgX22zoJRWa0FN5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+# 7.2.3 (2019-02-25)
+* 新增region类，zone继承
+* 上传可以指定上传域名
+* 新增上传指定上传空间和qvm指定上传内网的例子
+* 新增列举账号空间，创建空间，查询空间信息，改变文件状态接口，并提供例子
+
 # 7.2.2 (2018-05-10)
 * 增加连麦rtc服务端API功能
 
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,15 +1,15 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
+
 """
 批量查询文件信息
 
 https://developer.qiniu.com/kodo/api/1250/batch
 """
 
-
 from qiniu import build_batch_stat, Auth, BucketManager
 
 access_key = ''
-
 secret_key = ''
 
 q = Auth(access_key, secret_key)
diff --git a/examples/bucket_info.py b/examples/bucket_info.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+
+from qiniu import Auth
+from qiniu import BucketManager
+
+# 需要填写你的 Access Key 和 Secret Key
+access_key = ''
+secret_key = ''
+
+# 空间名
+bucket_name = 'bucket_name'
+
+q = Auth(access_key, secret_key)
+
+bucket = BucketManager(q)
+
+ret, info = bucket.bucket_info(bucket_name)
+print(info)
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,6 +1,9 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 
+"""
+改变文件的mimeType
+"""
 from qiniu import Auth
 from qiniu import BucketManager
 
diff --git a/examples/change_status.py b/examples/change_status.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+
+"""
+改变文件状态，可用或不可用
+"""
+from qiniu import Auth
+from qiniu import BucketManager
+
+# 需要填写你的 Access Key 和 Secret Key
+access_key = ''
+secret_key = ''
+
+q = Auth(access_key, secret_key)
+
+bucket = BucketManager(q)
+
+# 空间名
+bucket_name = 'bernie'
+
+# 文件名
+key = '233.jpg'
+
+# 条件匹配，只有匹配上才会执行修改操作
+# cond可以填空，一个或多个
+cond = {"fsize": "186371",
+        "putTime": "14899798962573916",
+        "hash": "FiRxWzeeD6ofGTpwTZub5Fx1ozvi",
+        "mime": "image/png"}
+
+ret, info = bucket.change_status(bucket_name, key, '1', cond)
+print(info)
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
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+    
+"""
+列举账号下的空间
+"""
+from qiniu import Auth
+from qiniu import BucketManager
+
+# 需要填写你的 Access Key 和 Secret Key
+access_key = ''
+secret_key = ''
+
+q = Auth(access_key, secret_key)
+
+bucket = BucketManager(q)
+
+# 指定需要列举的区域，填空字符串返回全部空间，为减少响应时间建议不为空
+# z0:只返回华东区域的空间
+# z1:只返回华北区域的空间
+# z2:只返回华南区域的空间
+# na0:只返回北美区域的空间
+# as0:只返回东南亚区域的空间
+region = "as0"
+
+ret, info = bucket.list_bucket(region)
+print(info)
+print(ret)
diff --git a/examples/mk_bucket.py b/examples/mk_bucket.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# flake8: noqa
+
+from qiniu import Auth
+from qiniu import BucketManager
+
+# 需要填写你的 Access Key 和 Secret Key
+access_key = '...'
+secret_key = '...'
+
+bucket_name = 'Bucket_Name'
+
+q = Auth(access_key, secret_key)
+
+bucket = BucketManager(q)
+
+region = "z0"
+
+ret, info = bucket.mkbucketv2(bucket_name, region)
+print(info)
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/examples/upload.py b/examples/upload.py
@@ -13,7 +13,7 @@
 q = Auth(access_key, secret_key)
 
 # 要上传的空间
-bucket_name = 'if-bc'
+bucket_name = ''
 
 # 上传到七牛后保存的文件名
 key = 'my-python-七牛.png'
diff --git a/examples/upload_with_qvmzone.py b/examples/upload_with_qvmzone.py
@@ -0,0 +1,40 @@
+# -*- 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'
+
+# up_host, 指定上传域名，注意不同区域的qvm上传域名不同
+# https://developer.qiniu.com/qvm/manual/4269/qvm-kodo
+
+zone = Zone(
+    up_host='free-qvm-z1-zz.qiniup.com',
+    up_host_backup='free-qvm-z1-zz.qiniup.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)
diff --git a/examples/upload_with_zone.py b/examples/upload_with_zone.py
@@ -1,38 +1,42 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 
-from qiniu import Auth, put_file, etag, urlsafe_base64_encode
-import qiniu.config
+from qiniu import Auth, put_file
 from qiniu import Zone, set_default
 
 # 需要填写你的 Access Key 和 Secret Key
-access_key = '...'
-secret_key = '...'
+access_key = ''
+secret_key = ''
 
 # 构建鉴权对象
 q = Auth(access_key, secret_key)
 
 # 要上传的空间
-bucket_name = 'Bucket_Name'
+bucket_name = 'bucket_name'
 
 # 上传到七牛后保存的文件名
-key = 'my-python-logo.png'
+key = 'a.jpg'
 
 # 生成上传 Token，可以指定过期时间等
 token = q.upload_token(bucket_name, key, 3600)
 
 # 要上传文件的本地路径
-localfile = 'stat.py'
+localfile = '/Users/abc/Documents/a.jpg'
+
+# 指定固定域名的zone,不同区域uphost域名见下文档
+# https://developer.qiniu.com/kodo/manual/1671/region-endpoint
+# 未指定或上传错误，sdk会根据token自动查询对应的上传域名
+# *.qiniup.com 支持https上传
+# 备用*.qiniu.com域名 不支持https上传
+# 要求https上传时，如果客户指定的两个host都错误，且sdk自动查询的第一个*.qiniup.com上传域名因意外不可用导致访问到备用*.qiniu.com会报ssl错误
+# 建议https上传时查看上面文档，指定正确的host
 
-# 指定固定的zone
 zone = Zone(
-    up_host='uptest.qiniu.com',
-    up_host_backup='uptest.qiniu.com',
-    io_host='iovip.qbox.me',
-    scheme='http')
+    up_host='https://up.qiniup.com',
+    up_host_backup='https://upload.qiniup.com',
+    io_host='http://iovip.qbox.me',
+    scheme='https')
 set_default(default_zone=zone)
 
 ret, info = put_file(token, key, localfile)
 print(info)
-assert ret['key'] == key
-assert ret['hash'] == etag(localfile)
diff --git a/qiniu/__init__.py b/qiniu/__init__.py
@@ -9,7 +9,7 @@
 
 # flake8: noqa
 
-__version__ = '7.2.2'
+__version__ = '7.2.3'
 
 from .auth import Auth, QiniuMacAuth
 
diff --git a/qiniu/auth.py b/qiniu/auth.py
diff --git a/qiniu/config.py b/qiniu/config.py
diff --git a/qiniu/region.py b/qiniu/region.py
diff --git a/qiniu/services/storage/bucket.py b/qiniu/services/storage/bucket.py
diff --git a/qiniu/services/storage/uploader.py b/qiniu/services/storage/uploader.py
diff --git a/qiniu/zone.py b/qiniu/zone.py
