Merge pull request #58 from qiniu/develop

Release v6.1.0

Author: xushiwei

.gitignore

@@ -4,6 +4,7 @@
 
 *.py[cod]
 
+my-test-env.sh
 
 ##
 ## from https://github.com/github/gitignore/blob/master/Python.gitignore

.travis.yml

@@ -2,13 +2,15 @@ language: python
 python:
   - "2.6"
   - "2.7"
+install:
+  - "pip install coverage --use-mirrors"
 before_script:
   - export QINIU_ACCESS_KEY="X0XpjFmLMTJpHB_ESHjeolCtipk-1U3Ok7LVTdoN"
   - export QINIU_SECRET_KEY="wenlwkU1AYwNBf7Q9cCoG4VT_GYyrHE9AS_R2u81"
-  - export QINIU_PIC_KEY="hello_jpg"
-  - export QINIU_NOEXIST_PIC_KEY="no_exist"
-  - export QINIU_BUCKET_NAME="pysdk"
-  - export QINIU_DOMAIN="pysdk.qiniudn.com"
-script: 
-  - python setup.py nosetests
-  - export PYTHONPATH="$PYTHONPATH:." && python docs/demo.py
+  - export QINIU_TEST_BUCKET="pysdk"
+  - export QINIU_TEST_DOMAIN="pysdk.qiniudn.com"
+  - export PYTHONPATH="$PYTHONPATH:."
+script:
+  - nosetests --with-coverage --cover-package=qiniu
+  - python docs/demo.py
+  - python docs/gist/conf.py

CHANGELOG.md

@@ -1,12 +1,24 @@
 ## CHANGE LOG
 
+### v6.1.0
+
+2013-07-03 issue [#58](https://github.com/qiniu/python-sdk/pull/58)
+
+- 实现最新版的上传API，<http://docs.qiniu.com/api/put.html>
+	- io.PutExtra更新，废弃callback_params，bucket，和custom_meta，新增params
+- 修复[#16](https://github.com/qiniu/python-sdk/issues/16)
+	- put接口可以传入类文件对象（file-like object）
+- 修复[#52](https://github.com/qiniu/python-sdk/issues/52)
+
+
 ### v6.0.1
 
 2013-06-27 issue [#43](https://github.com/qiniu/python-sdk/pull/43)
 
 - 遵循 [sdkspec v6.0.2](https://github.com/qiniu/sdkspec/tree/v6.0.2)
 	- 现在，rsf.list_prefix在没有更多数据时，err 会返回 rsf.EOF
 
+
 ### v6.0.0
 
 2013-06-26 issue [#42](https://github.com/qiniu/python-sdk/pull/42)

README.md

@@ -9,6 +9,23 @@ Qiniu Resource Storage SDK for Python
 
 参考文档：[七牛云存储 Python SDK 使用指南](https://github.com/qiniu/python-sdk/blob/develop/docs/README.md)
 
+## 单元测试
+
+1. 测试环境
+
+	1. [开通七牛开发者帐号](https://portal.qiniu.com/signup)
+	2. [登录七牛开发者自助平台，查看 Access Key 和 Secret Key](https://portal.qiniu.com/setting/key) 。
+	3. 在开发者后台新建一个空间
+
+	然后将在`test-env.sh`中填入相关信息。
+
+2. 需安装[nosetests](https://nose.readthedocs.org/en/latest/)测试工具。
+
+运行测试：
+
+	source test-env.sh
+	nosetests
+
 ## 贡献代码
 
 1. Fork

docs/README.md

@@ -259,10 +259,12 @@ qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
 
 import qiniu.io
 
-extra = qiniu.io.PutExtra(bucket_name)
+extra = qiniu.io.PutExtra()
 extra.mime_type = "text/plain"
 
-ret, err = qiniu.io.put(uptoken, key, "hello!", extra)
+# data 可以是str或read()able对象
+data = StringIO.StringIO("hello!")
+ret, err = qiniu.io.put(uptoken, key, data, extra)
 if err is not None:
 	error(err)
 	return
@@ -279,9 +281,8 @@ qiniu.conf.SECRET_KEY = "<YOUR_APP_SECRET_KEY>"
 import qiniu.io
 
 localfile = "%s" % __file__
-extra = qiniu.io.PutExtra(bucket_name)
 
-ret, err = qiniu.io.put_file(uptoken, key, localfile, extra)
+ret, err = qiniu.io.put_file(uptoken, key, localfile)
 if err is not None:
 	error(err)
 	return

docs/demo.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
 import sys
+import StringIO
 
 # @gist import_io
 import qiniu.io
@@ -49,9 +50,9 @@ def _setup():
 	if access_key is None:
 		exit("请配置环境变量 QINIU_ACCESS_KEY")
 	secret_key = getenv("QINIU_SECRET_KEY")
-	bucket_name = getenv("QINIU_BUCKET_NAME")
-	domain = getenv("QINIU_DOMAIN")
-	pickey = getenv("QINIU_PIC_KEY")
+	bucket_name = getenv("QINIU_TEST_BUCKET")
+	domain = getenv("QINIU_TEST_DOMAIN")
+	pickey = 'QINIU_UNIT_TEST_PIC'
 	setup(access_key, secret_key, bucket_name, domain, pickey)
 
 def getenv(name):
@@ -95,9 +96,8 @@ def put_file():
 
 	# @gist put_file
 	localfile = "%s" % __file__
-	extra = qiniu.io.PutExtra(bucket_name)
-	
-	ret, err = qiniu.io.put_file(uptoken, key, localfile, extra)
+
+	ret, err = qiniu.io.put_file(uptoken, key, localfile)
 	if err is not None:
 		error(err)
 		return
@@ -110,10 +110,12 @@ def put_binary():
 	qiniu.rs.Client().delete(bucket_name, key)
 
 	# @gist put
-	extra = qiniu.io.PutExtra(bucket_name)
+	extra = qiniu.io.PutExtra()
 	extra.mime_type = "text/plain"
 
-	ret, err = qiniu.io.put(uptoken, key, "hello!", extra)
+	# data 可以是str或read()able对象
+	data = StringIO.StringIO("hello!")
+	ret, err = qiniu.io.put(uptoken, key, data, extra)
 	if err is not None:
 		error(err)
 		return

qiniu/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 '''
 Qiniu Resource Storage SDK for Python
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -7,4 +6,5 @@
 <https://github.com/qiniu/python-sdk/blob/develop/docs/README.md>
 '''
 
-__version__ = '6.0.1'
+# -*- coding: utf-8 -*-
+__version__ = '6.1.0'

qiniu/httplib_chunk.py

@@ -0,0 +1,123 @@
+"""
+Modified from standard httplib
+
+1. HTTPConnection can send trunked data.
+2. Remove httplib's automatic Content-Length insertion when data is a file-like object.
+"""
+
+# -*- coding: utf-8 -*-
+
+import httplib
+from httplib import _CS_REQ_STARTED, _CS_REQ_SENT
+import string
+import os
+from array import array
+
+class HTTPConnection(httplib.HTTPConnection):
+
+	def send(self, data, is_chunked=False):
+		"""Send `data' to the server."""
+		if self.sock is None:
+			if self.auto_open:
+				self.connect()
+			else:
+				raise NotConnected()
+
+		if self.debuglevel > 0:
+			print "send:", repr(data)
+		blocksize = 8192
+		if hasattr(data,'read') and not isinstance(data, array):
+			if self.debuglevel > 0: print "sendIng a read()able"
+			datablock = data.read(blocksize)
+			while datablock:
+				if self.debuglevel > 0:
+					print 'chunked:', is_chunked
+				if is_chunked:
+					if self.debuglevel > 0: print 'send: with trunked data'
+					lenstr = string.upper(hex(len(datablock))[2:])
+					self.sock.sendall('%s\r\n%s\r\n' % (lenstr, datablock))
+				else:
+					self.sock.sendall(datablock)
+				datablock = data.read(blocksize)
+			if is_chunked:
+				self.sock.sendall('0\r\n\r\n')
+		else:
+			self.sock.sendall(data)
+
+
+	def _set_content_length(self, body):
+		# Set the content-length based on the body.
+		thelen = None
+		try:
+			thelen = str(len(body))
+		except (TypeError, AttributeError), te:
+			# Don't send a length if this failed
+			if self.debuglevel > 0: print "Cannot stat!!"
+
+		if thelen is not None:
+			self.putheader('Content-Length', thelen)
+			return True
+		return False
+
+
+	def _send_request(self, method, url, body, headers):
+		# Honor explicitly requested Host: and Accept-Encoding: headers.
+		header_names = dict.fromkeys([k.lower() for k in headers])
+		skips = {}
+		if 'host' in header_names:
+			skips['skip_host'] = 1
+		if 'accept-encoding' in header_names:
+			skips['skip_accept_encoding'] = 1
+
+		self.putrequest(method, url, **skips)
+
+		is_chunked = False
+		if body and header_names.get('Transfer-Encoding') == 'chunked':
+			is_chunked = True
+		elif body and ('content-length' not in header_names):
+			is_chunked = not self._set_content_length(body)
+			if is_chunked:
+				self.putheader('Transfer-Encoding', 'chunked')
+		for hdr, value in headers.iteritems():
+			self.putheader(hdr, value)
+
+		self.endheaders(body, is_chunked=is_chunked)
+
+
+	def endheaders(self, message_body=None, is_chunked=False):
+		"""Indicate that the last header line has been sent to the server.
+
+		This method sends the request to the server.  The optional
+		message_body argument can be used to pass a message body
+		associated with the request.  The message body will be sent in
+		the same packet as the message headers if it is string, otherwise it is
+		sent as a separate packet.
+		"""
+		if self.__state == _CS_REQ_STARTED:
+			self.__state = _CS_REQ_SENT
+		else:
+			raise CannotSendHeader()
+		self._send_output(message_body, is_chunked=is_chunked)
+
+
+	def _send_output(self, message_body=None, is_chunked=False):
+		"""Send the currently buffered request and clear the buffer.
+
+		Appends an extra \\r\\n to the buffer.
+		A message_body may be specified, to be appended to the request.
+		"""
+		self._buffer.extend(("", ""))
+		msg = "\r\n".join(self._buffer)
+		del self._buffer[:]
+		# If msg and message_body are sent in a single send() call,
+		# it will avoid performance problems caused by the interaction
+		# between delayed ack and the Nagle algorithm.
+		if isinstance(message_body, str):
+			msg += message_body
+			message_body = None
+		self.send(msg)
+		if message_body is not None:
+			#message_body was not a string (i.e. it is a file) and
+			#we must run the risk of Nagle
+			self.send(message_body, is_chunked=is_chunked)
+