merged develop

Author: xushiwei

docs/README.md

@@ -2,6 +2,8 @@
 title: Python SDK 使用指南
 ---
 
+# Python SDK 使用指南
+
 此 Python SDK 适用于2.x版本，基于 [七牛云存储官方API](http://docs.qiniu.com/) 构建。使用此 SDK 构建您的网络应用程序，能让您以非常便捷地方式将数据安全地存储到七牛云存储上。无论您的网络应用是一个网站程序，还是包括从云端（服务端程序）到终端（手持设备应用）的架构的服务或应用，通过七牛云存储及其 SDK，都能让您应用程序的终端用户高速上传和下载，同时也让您的服务端更加轻盈。
 
 SDK 下载地址：<https://github.com/qiniu/python-sdk/tags>

qiniu/auth/up.py

@@ -5,10 +5,12 @@
 
 class Client(rpc.Client):
 	up_token = None
-	
+
 	def __init__(self, up_token, host=None):
 		if host is None:
 			host = conf.UP_HOST
+		if host.startswith("http://"):
+			host = host[7:]
 		self.up_token = up_token
 		super(Client, self).__init__(host)
 

qiniu/resumable_io.py

@@ -84,15 +84,14 @@ def put(uptoken, key, f, fsize, extra):
 	if extra.chunk_size is None:
 		extra.chunk_size = _chunk_size
 
-	client = auth.up.Client(uptoken)
 	for i in xrange(0, block_cnt):
 		try_time = extra.try_times
 		read_length = _block_size
 		if (i+1)*_block_size > fsize:
 			read_length = fsize - i*_block_size
 		data_slice = f.read(read_length)
 		while True:
-			err = resumable_block_put(client, data_slice, i, extra)
+			err = resumable_block_put(data_slice, i, extra, uptoken)
 			if err is None:
 				break
 
@@ -101,34 +100,38 @@ def put(uptoken, key, f, fsize, extra):
 				return None, err_put_failed
 			print err, ".. retry"
 
-	return mkfile(client, key, fsize, extra)
+	mkfile_client = auth.up.Client(uptoken, extra.progresses[-1]["host"])
+	return mkfile(mkfile_client, key, fsize, extra)
 
 # ----------------------------------------------------------
 
-def resumable_block_put(client, block, index, extra):
+def resumable_block_put(block, index, extra, uptoken):
 	block_size = len(block)
 
+	mkblk_client = auth.up.Client(uptoken, conf.UP_HOST)
 	if extra.progresses[index] is None or "ctx" not in extra.progresses[index]:
 		end_pos = extra.chunk_size-1
 		if block_size < extra.chunk_size:
 			end_pos = block_size-1
 		chunk = block[: end_pos]
 		crc32 = gen_crc32(chunk)
 		chunk = bytearray(chunk)
-		extra.progresses[index], err = mkblock(client, block_size, chunk)
+		extra.progresses[index], err = mkblock(mkblk_client, block_size, chunk)
 		if not extra.progresses[index]["crc32"] == crc32:
 			return err_unmatched_checksum
 		if err is not None:
 			extra.notify_err(index, end_pos + 1, err)
 			return err
 		extra.notify(index, end_pos + 1, extra.progresses[index])
 
+	bput_client = auth.up.Client(uptoken, extra.progresses[index]["host"])
 	while extra.progresses[index]["offset"] < block_size:
 		offset = extra.progresses[index]["offset"]
 		chunk = block[offset: offset+extra.chunk_size-1]
 		crc32 = gen_crc32(chunk)
 		chunk = bytearray(chunk)
-		extra.progresses[index], err = putblock(client, extra.progresses[index], chunk)
+
+		extra.progresses[index], err = putblock(bput_client, extra.progresses[index], chunk)
 		if not extra.progresses[index]["crc32"] == crc32:
 			return err_unmatched_checksum
 		if err is not None:

qiniu/rsf.py

@@ -36,6 +36,6 @@ def list_prefix(self, bucket, prefix=None, marker=None, limit=None):
 			ops['prefix'] = prefix
 		url = '%s?%s' % ('/list', urllib.urlencode(ops))
 		ret, err = self.conn.call_with(url, body=None, content_type='application/x-www-form-urlencoded')
-		if not ret or not ret.get('marker'):
+		if ret and not ret.get('marker'):
 			err = EOF
 		return ret, err

qiniu/test/rsf_test.py

@@ -11,9 +11,9 @@
 class TestRsf(unittest.TestCase):
 	def test_list_prefix(self):
 		c = rsf.Client()
-		ret, err = c.list_prefix(bucket_name, limit = 1)
+		ret, err = c.list_prefix(bucket_name, limit = 4)
 		self.assertEqual(err is rsf.EOF or err is None, True)
-		assert len(ret.get('items')) == 1
+		assert len(ret.get('items')) == 4
 
 
 if __name__ == "__main__":