Merge pull request #157 from longbai/master

配置io/rs/rsf/api host

Author: longbai

CHANGELOG.md

@@ -1,5 +1,9 @@
 #Changelog
 
+## 7.0.3 (2014-03-11)
+### 增加
+* 可以配置 io/rs/api/rsf host
+
 ## 7.0.2 (2014-12-24)
 ### 修正
 * 内部http get当没有auth会出错

qiniu/__init__.py

@@ -9,7 +9,7 @@
 
 # flake8: noqa
 
-__version__ = '7.0.2'
+__version__ = '7.0.3'
 
 from .auth import Auth
 

qiniu/config.py

@@ -7,11 +7,16 @@
 
 UPAUTO_HOST = 'up.qiniu.com'        # 默认上传Host
 UPDX_HOST = 'updx.qiniu.com'        # 电信上传Host
-UPLT_HOST = 'uplt.qiniu.com'        # 移动上传Host
+UPLT_HOST = 'uplt.qiniu.com'        # 联通上传Host
+UPYD_HOST = 'upyd.qiniu.com'        # 移动上传Host
 UPBACKUP_HOST = 'upload.qiniu.com'  # 备用上传Host
 
 _config = {
     'default_up_host': UPAUTO_HOST,  # 设置为默认上传Host
+    '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
@@ -25,9 +30,19 @@ def get_default(key):
 
 
 def set_default(
-        default_up_host=None, connection_retries=None, connection_pool=None, connection_timeout=None):
+        default_up_host=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_rs_host:
+        _config['default_rs_host'] = default_rs_host
+    if default_io_host:
+        _config['default_io_host'] = default_io_host
+    if default_rsf_host:
+        _config['default_rsf_host'] = default_rsf_host
+    if default_api_host:
+        _config['default_api_host'] = default_api_host
     if connection_retries:
         _config['connection_retries'] = connection_retries
     if connection_pool:

qiniu/services/processing/pfop.py

@@ -45,5 +45,5 @@ def execute(self, key, fops, force=None):
         if force == 1:
             data['force'] = 1
 
-        url = 'http://{0}/pfop'.format(config.API_HOST)
+        url = 'http://{0}/pfop'.format(config.get_default('default_api_host'))
         return http._post_with_auth(url, data, self.auth)

qiniu/services/storage/bucket.py

@@ -51,7 +51,7 @@ def list(self, bucket, prefix=None, marker=None, limit=None, delimiter=None):
         if delimiter is not None:
             options['delimiter'] = delimiter
 
-        url = 'http://{0}/list'.format(config.RSF_HOST)
+        url = 'http://{0}/list'.format(config.get_default('default_rsf_host'))
         ret, info = self.__get(url, options)
 
         eof = False
@@ -227,7 +227,7 @@ def batch(self, operations):
                 ]
             一个ReponseInfo对象
         """
-        url = 'http://{0}/batch'.format(config.RS_HOST)
+        url = 'http://{0}/batch'.format(config.get_default('default_rs_host'))
         return self.__post(url, dict(op=operations))
 
     def buckets(self):
@@ -243,10 +243,10 @@ def buckets(self):
         return self.__rs_do('buckets')
 
     def __rs_do(self, operation, *args):
-        return self.__server_do(config.RS_HOST, operation, *args)
+        return self.__server_do(config.get_default('default_rs_host'), operation, *args)
 
     def __io_do(self, operation, *args):
-        return self.__server_do(config.IO_HOST, operation, *args)
+        return self.__server_do(config.get_default('default_io_host'), operation, *args)
 
     def __server_do(self, host, operation, *args):
         cmd = _build_op(operation, *args)

test_qiniu.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
-import os  
+import os
 import string
 import random
 import tempfile
@@ -307,6 +307,7 @@ def test_retry(self):
         assert ret['key'] == key
         qiniu.set_default(default_up_host=qiniu.config.UPAUTO_HOST)
 
+
 class DownloadTestCase(unittest.TestCase):
 
     q = Auth(access_key, secret_key)
@@ -316,7 +317,7 @@ def test_private_url(self):
         private_key = 'gogopher.jpg'
         base_url = 'http://%s/%s' % (private_bucket+'.qiniudn.com', private_key)
         private_url = self.q.private_download_url(base_url, expires=3600)
-        print(private_url) 
+        print(private_url)
         r = requests.get(private_url)
         assert r.status_code == 200