Merge pull request #126 from qiniu/develop

Release 6.1.8

Author: longbai

Diff for: CHANGELOG.md

@@ -1,5 +1,16 @@
 ## CHANGE LOG
 
+### v6.1.8
+
+2014-08-05 issue [#126](https://github.com/qiniu/python-sdk/pull/126)
+- [#125] 网络出错不抛异常
+
+### v6.1.7
+
+2014-07-10 issue [#123](https://github.com/qiniu/python-sdk/pull/123)
+- [#121] 上传多host重试
+- [#122] 修改上传域名
+
 ### v6.1.6
 
 2014-06-30 issue [#118](https://github.com/qiniu/python-sdk/pull/118)

Diff for: qiniu/__init__.py

@@ -7,4 +7,4 @@
 '''
 
 # -*- coding: utf-8 -*-
-__version__ = '6.1.7'
+__version__ = '6.1.8'

Diff for: qiniu/rpc.py

@@ -44,14 +44,15 @@ def call_with(self, path, body, content_type=None, content_length=None):
         if content_length is not None:
             header["Content-Length"] = content_length
 
-        resp = self.round_tripper("POST", path, body, header)
         try:
+            resp = self.round_tripper("POST", path, body, header)
             ret = resp.read()
             ret = json.loads(ret)
-        except IOError, e:
-            return None, e
         except ValueError:
+            # ignore empty body when success
             pass
+        except Exception, e:
+            return None, str(e)+path, 0
 
         if resp.status >= 400:
             err_msg = ret if "error" not in ret else ret["error"]