Merge pull request #404 from qiniu/features/add-decode-except

Features/add decode except

Author: xwen-winnie

qiniu/http.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import logging
 import platform
 
 import requests
@@ -23,8 +24,10 @@ def __return_wrapper(resp):
     if resp.status_code != 200 or resp.headers.get('X-Reqid') is None:
         return None, ResponseInfo(resp)
     resp.encoding = 'utf-8'
-    ret = resp.json() if resp.text != '' else {}
-    if ret is None:  # json null
+    try:
+        ret = resp.json()
+    except ValueError:
+        logging.debug("response body decode error: %s" % resp.text)
         ret = {}
     return ret, ResponseInfo(resp)
 

qiniu/region.py

@@ -11,9 +11,7 @@
 
 class Region(object):
     """七牛上传区域类
-
     该类主要内容上传区域地址。
-
     """
 
     def __init__(

qiniu/services/storage/upload_progress_recorder.py

@@ -36,8 +36,15 @@ def get_upload_record(self, file_name, key):
         upload_record_file_path = os.path.join(self.record_folder, record_file_name)
         if not os.path.isfile(upload_record_file_path):
             return None
-        with open(upload_record_file_path, 'r') as f:
-            json_data = json.load(f)
+        try:
+            with open(upload_record_file_path, 'r') as f:
+                try:
+                    json_data = json.load(f)
+                except ValueError:
+                    json_data = None
+        except IOError:
+            json_data = None
+
         return json_data
 
     def set_upload_record(self, file_name, key, data):

test_qiniu.py

@@ -21,6 +21,8 @@
 
 from qiniu.services.storage.uploader import _form_put
 
+from qiniu.http import __return_wrapper as return_wrapper
+
 import qiniu.config
 
 if is_py2:
@@ -75,6 +77,23 @@ def is_travis():
     return os.environ['QINIU_TEST_ENV'] == 'travis'
 
 
+class HttpTest(unittest.TestCase):
+    def test_json_decode_error(self):
+        def mock_res():
+            r = requests.Response()
+            r.status_code = 200
+            r.headers.__setitem__('X-Reqid', 'mockedReqid')
+
+            def json_func():
+                raise ValueError('%s: line %d column %d (char %d)' % ('Expecting value', 0, 0, 0))
+            r.json = json_func
+
+            return r
+        mocked_res = mock_res()
+        ret, _ = return_wrapper(mocked_res)
+        assert ret == {}
+
+
 class UtilsTest(unittest.TestCase):
     def test_urlsafe(self):
         a = 'hello\x96'