fix ci and unitest

Author: forrest-mao

qiniu/utils.py

@@ -3,8 +3,6 @@
 from hashlib import sha1
 from base64 import urlsafe_b64encode, urlsafe_b64decode
 
-from .config import _BLOCK_SIZE
-
 from .compat import b, s
 
 try:
@@ -14,6 +12,8 @@
     zlib = None
     import binascii
 
+_BLOCK_SIZE = 1024 * 1024 * 4
+
 
 def urlsafe_base64_encode(data):
     """urlsafe的base64编码:

qiniu/zone.py

@@ -2,9 +2,10 @@
 
 import os
 import time
+import requests
 
-from qiniu import http
-from qiniu import compat, utils
+from qiniu import compat
+from qiniu import utils
 
 UC_HOST = 'https://uc.qbox.me'      # 获取空间信息Host
 
@@ -55,7 +56,7 @@ def unmarshal_up_token(self, up_token):
             raise ValueError('invalid up_token')
 
         ak = token[0]
-        policy = compat.json.loads(str(utils.urlsafe_base64_decode(token[2]), "utf-8"))
+        policy = compat.json.loads(compat.s(utils.urlsafe_base64_decode(token[2])))
 
         scope = policy["scope"]
         bucket = scope
@@ -82,10 +83,6 @@ def get_bucket_hosts(self, ak, bucket):
 
         self.set_bucket_hosts_to_cache(key, bucket_hosts)
 
-        # hosts = self.bucket_hosts(ak, bucket)
-        # self.up_host = compat.json.loads(hosts)[self.scheme]["up"][0]
-        # self.up_host_backup = compat.json.loads(hosts)[self.scheme]["up"][1]
-        # self.io_host = compat.json.loads(hosts)[self.scheme]["io"][0]
         return bucket_hosts
 
     def get_bucket_hosts_to_cache(self, key):
@@ -124,10 +121,11 @@ def host_cache_to_file(self):
 
     def host_cache_file_path(self):
         home = os.getenv("HOME")
-        return home + "/.qiniu_pythonsdk_hostscache2.json"
+        return home + "/.qiniu_pythonsdk_hostscache.json"
 
     def bucket_hosts(self, ak, bucket):
         url = "{0}/v1/query?ak={1}&bucket={2}".format(UC_HOST, ak, bucket)
-        ret, info = http._get(url, None, None)
-        data = compat.json.dumps(ret, separators=(',', ':'))
+        ret = requests.get(url)
+        # ret, info = http._get(url, None, None)
+        data = compat.json.dumps(ret.json(), separators=(',', ':'))
         return data

test_qiniu.py

@@ -325,44 +325,40 @@ def test_putWithoutKey(self):
     def test_withoutRead_withoutSeek_retry(self):
         key = 'retry'
         data = 'hello retry!'
-        set_default(default_zone=Zone('a', 'upload.qiniu.com'))
+        set_default(default_zone=Zone('http://a', 'http://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_zone=qiniu.config.zone0)
 
     def test_hasRead_hasSeek_retry(self):
         key = 'withReadAndSeek_retry'
         data = StringIO('hello retry again!')
-        set_default(default_zone=Zone('a', 'upload.qiniu.com'))
+        set_default(default_zone=Zone('http://a', 'http://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_zone=qiniu.config.zone0)
 
     def test_hasRead_withoutSeek_retry(self):
         key = 'withReadAndWithoutSeek_retry'
         data = ReadWithoutSeek('I only have read attribute!')
-        set_default(default_zone=Zone('a', 'upload.qiniu.com'))
+        set_default(default_zone=Zone('http://a', 'http://upload.qiniu.com'))
         token = self.q.upload_token(bucket_name)
         ret, info = put_data(token, key, data)
         print(info)
         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_zone=Zone('a', 'upload.qiniu.com'))
+        set_default(default_zone=Zone('http://a', 'http://upload.qiniu.com'))
         token = self.q.upload_token(bucket_name)
         ret, info = put_data(token, key, data)
         print(info)
-        assert ret is None
-        qiniu.set_default(default_zone=qiniu.config.zone0)
+        assert ret is not None
 
     def test_putData_without_fname(self):
         if is_travis():
@@ -419,23 +415,21 @@ 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_zone=Zone('a', 'upload.qiniu.com'))
+        qiniu.set_default(default_zone=Zone('http://a', 'http://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_zone=qiniu.config.zone0)
         remove_temp_file(localfile)
 
     def test_retry(self):
         localfile = __file__
         key = 'test_file_r_retry'
-        qiniu.set_default(default_zone=Zone('a', 'upload.qiniu.com'))
+        qiniu.set_default(default_zone=Zone('http://a', 'http://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_zone=qiniu.config.zone0)
 
 
 class DownloadTestCase(unittest.TestCase):