Merge pull request #168 from longbai/master

multi zone

Author: longbai

CHANGELOG.md

@@ -1,12 +1,18 @@
 #Changelog
 
-## 7.0.4 (2014-05-04)
+## 7.0.5 (2015-06-25)
+### 变更
+* 配置up_host 改为配置zone
+
+### 增加
+* fectch 支持不指定key
+
+## 7.0.4 (2015-05-04)
 ### 修正
 * 上传重试为空文件
 * 回调应该只对form data 签名。
 
-
-## 7.0.3 (2014-03-11)
+## 7.0.3 (2015-03-11)
 ### 增加
 * 可以配置 io/rs/api/rsf host
 

qiniu/__init__.py

@@ -9,11 +9,11 @@
 
 # flake8: noqa
 
-__version__ = '7.0.4'
+__version__ = '7.0.5'
 
 from .auth import Auth
 
-from .config import set_default
+from .config import set_default, Zone
 
 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

qiniu/auth.py

@@ -53,8 +53,8 @@ class Auth(object):
     def __init__(self, access_key, secret_key):
         """初始化Auth类"""
         self.__checkKey(access_key, secret_key)
-        self.__access_key, self.__secret_key = access_key, secret_key
-        self.__secret_key = b(self.__secret_key)
+        self.__access_key = access_key
+        self.__secret_key = b(secret_key)
 
     def __token(self, data):
         data = b(data)

qiniu/config.py

@@ -5,36 +5,50 @@
 RSF_HOST = 'rsf.qbox.me'    # 列举操作Host
 API_HOST = 'api.qiniu.com'  # 数据处理操作Host
 
-UPAUTO_HOST = 'up.qiniu.com'        # 默认上传Host
-UPDX_HOST = 'updx.qiniu.com'        # 电信上传Host
-UPLT_HOST = 'uplt.qiniu.com'        # 联通上传Host
-UPYD_HOST = 'upyd.qiniu.com'        # 移动上传Host
-UPBACKUP_HOST = 'upload.qiniu.com'  # 备用上传Host
+_BLOCK_SIZE = 1024 * 1024 * 4  # 断点续上传分块大小，该参数为接口规格，暂不支持修改
+
+
+class Zone(object):
+    """七牛上传区域类
+
+    该类主要内容上传区域地址。
+
+    Attributes:
+        up_host: 首选上传地址
+        up_host_backup: 备用上传地址
+    """
+    def __init__(self, up_host, up_host_backup):
+        """初始化Zone类"""
+        self.up_host, self.up_host_backup = up_host, up_host_backup
+
+
+zone0 = Zone('up.qiniu.com', 'upload.qiniu.com')
+zone1 = Zone('up-z1.qiniu.com', 'upload-z1.qiniu.com')
 
 _config = {
-    'default_up_host': UPAUTO_HOST,  # 设置为默认上传Host
+    'default_up_host': zone0.up_host,  # 设置为默认上传Host
+    'default_up_host_backup': zone0.up_host_backup,
     'default_rs_host': RS_HOST,
     'default_io_host': IO_HOST,
     'default_rsf_host': RSF_HOST,
     'default_api_host': API_HOST,
     'connection_timeout': 30,        # 链接超时为时间为30s
     'connection_retries': 3,         # 链接重试次数为3次
     'connection_pool': 10,           # 链接池个数为10
-
 }
-_BLOCK_SIZE = 1024 * 1024 * 4  # 断点续上传分块大小，该参数为接口规格，暂不支持修改
 
 
 def get_default(key):
     return _config[key]
 
 
 def set_default(
-        default_up_host=None, connection_retries=None, connection_pool=None,
+        default_zone=None, connection_retries=None, connection_pool=None,
         connection_timeout=None, default_rs_host=None, default_io_host=None,
         default_rsf_host=None, default_api_host=None):
-    if default_up_host:
-        _config['default_up_host'] = default_up_host
+    if default_zone:
+        _config['default_up_host'] = default_zone.up_host
+        _config['default_up_host_backup'] = default_zone.up_host_backup
     if default_rs_host:
         _config['default_rs_host'] = default_rs_host
     if default_io_host:

qiniu/services/storage/uploader.py

@@ -71,7 +71,7 @@ def _form_put(up_token, key, data, params, mime_type, crc, progress_handler=None
     r, info = http._post_file(url, data=fields, files={'file': (name, data, mime_type)})
     if r is None and info.need_retry():
         if info.connect_failed:
-            url = 'http://' + config.UPBACKUP_HOST + '/'
+            url = 'http://' + config.get_default('default_up_host_backup') + '/'
         if hasattr(data, 'read') is False:
             pass
         elif hasattr(data, 'seek') and (not hasattr(data, 'seekable') or data.seekable()):
@@ -126,7 +126,7 @@ def upload(self):
             if ret is None and not info.need_retry:
                 return ret, info
             if info.connect_failed:
-                host = config.UPBACKUP_HOST
+                host = config.get_default('default_up_host_backup')
             if info.need_retry or crc != ret['crc32']:
                 ret, info = self.make_block(block, length, host)
                 if ret is None or crc != ret['crc32']:

test_qiniu.py

@@ -9,7 +9,7 @@
 import unittest
 import pytest
 
-from qiniu import Auth, set_default, etag, PersistentFop, build_op, op_save
+from qiniu import Auth, set_default, etag, PersistentFop, build_op, op_save, Zone
 from qiniu import put_data, put_file, put_stream
 from qiniu import BucketManager, build_batch_copy, build_batch_rename, build_batch_move, build_batch_stat, build_batch_delete
 from qiniu import urlsafe_base64_encode, urlsafe_base64_decode
@@ -132,13 +132,13 @@ def test_fetch(self):
         ret, info = self.bucket.fetch('http://developer.qiniu.com/docs/v6/sdk/python-sdk.html', bucket_name, 'fetch.html')
         print(info)
         assert ret['key'] == 'fetch.html'
-        assert ret['hash'] == 'FhwVT7vs6xqs1nu_vEdo_4x4qBMB'
+        assert 'hash' in ret
 
     def test_fetch_without_key(self):
         ret, info = self.bucket.fetch('http://developer.qiniu.com/docs/v6/sdk/python-sdk.html', bucket_name)
         print(info)
-        assert ret['key'] == 'FhwVT7vs6xqs1nu_vEdo_4x4qBMB'
-        assert ret['hash'] == 'FhwVT7vs6xqs1nu_vEdo_4x4qBMB'
+        assert ret['key'] == ret['hash']
+        assert 'hash' in ret
 
     def test_stat(self):
         ret, info = self.bucket.stat(bucket_name, 'python-sdk.html')
@@ -277,44 +277,44 @@ def test_putWithoutKey(self):
     def test_withoutRead_withoutSeek_retry(self):
         key = 'retry'
         data = 'hello retry!'
-        set_default(default_up_host='a')
+        set_default(default_zone=Zone('a', 'upload.qiniu.com'))
         token = self.q.upload_token(bucket_name)
         ret, info = put_data(token, key, data)
         print(info)
         assert ret['key'] == key
         assert ret['hash'] == 'FlYu0iBR1WpvYi4whKXiBuQpyLLk'
-        qiniu.set_default(default_up_host=qiniu.config.UPAUTO_HOST)
+        qiniu.set_default(default_zone=qiniu.config.zone0)
 
     def test_hasRead_hasSeek_retry(self):
         key = 'withReadAndSeek_retry'
         data = StringIO('hello retry again!')
-        set_default(default_up_host='a')
+        set_default(default_zone=Zone('a', 'upload.qiniu.com'))
         token = self.q.upload_token(bucket_name)
         ret, info = put_data(token, key, data)
         print(info)
         assert ret['key'] == key
         assert ret['hash'] == 'FuEbdt6JP2BqwQJi7PezYhmuVYOo'
-        qiniu.set_default(default_up_host=qiniu.config.UPAUTO_HOST)
+        qiniu.set_default(default_zone=qiniu.config.zone0)
 
     def test_hasRead_withoutSeek_retry(self):
         key = 'withReadAndWithoutSeek_retry'
         data = ReadWithoutSeek('I only have read attribute!')
-        set_default(default_up_host='a')
+        set_default(default_zone=Zone('a', 'upload.qiniu.com'))
         token = self.q.upload_token(bucket_name)
         ret, info = put_data(token, key, data)
         print(info)
-        assert ret == None
-        qiniu.set_default(default_up_host=qiniu.config.UPAUTO_HOST)
+        assert ret is None
+        qiniu.set_default(default_zone=qiniu.config.zone0)
 
     def test_hasRead_WithoutSeek_retry2(self):
         key = 'withReadAndWithoutSeek_retry2'
         data = urlopen("http://www.qiniu.com")
-        set_default(default_up_host='a')
+        set_default(default_zone=Zone('a', 'upload.qiniu.com'))
         token = self.q.upload_token(bucket_name)
         ret, info = put_data(token, key, data)
         print(info)
-        assert ret == None
-        qiniu.set_default(default_up_host=qiniu.config.UPAUTO_HOST)
+        assert ret is None
+        qiniu.set_default(default_zone=qiniu.config.zone0)
 
 
 class ResumableUploaderTestCase(unittest.TestCase):
@@ -338,23 +338,23 @@ def test_big_file(self):
         token = self.q.upload_token(bucket_name, key)
         localfile = create_temp_file(4 * 1024 * 1024 + 1)
         progress_handler = lambda progress, total: progress
-        qiniu.set_default(default_up_host='a')
+        qiniu.set_default(default_zone=Zone('a', 'upload.qiniu.com'))
         ret, info = put_file(token, key, localfile, self.params, self.mime_type, progress_handler=progress_handler)
         print(info)
         assert ret['key'] == key
-        qiniu.set_default(default_up_host=qiniu.config.UPAUTO_HOST)
+        qiniu.set_default(default_zone=qiniu.config.zone0)
         remove_temp_file(localfile)
 
     def test_retry(self):
         localfile = __file__
         key = 'test_file_r_retry'
-        qiniu.set_default(default_up_host='a')
+        qiniu.set_default(default_zone=Zone('a', 'upload.qiniu.com'))
         token = self.q.upload_token(bucket_name, key)
         ret, info = put_file(token, key, localfile, self.params, self.mime_type)
         print(info)
         assert ret['key'] == key
         assert ret['hash'] == etag(localfile)
-        qiniu.set_default(default_up_host=qiniu.config.UPAUTO_HOST)
+        qiniu.set_default(default_zone=qiniu.config.zone0)
 
 
 class DownloadTestCase(unittest.TestCase):