fix put_data 400

Author: forrest-mao

qiniu/services/storage/uploader.py

@@ -10,7 +10,7 @@
 
 
 def put_data(
-        up_token, key, data, params=None, mime_type='application/octet-stream', check_crc=False, progress_handler=None):
+        up_token, key, data, params=None, mime_type='application/octet-stream', check_crc=False, progress_handler=None, fname=None):
     """上传二进制流到七牛
 
     Args:
@@ -27,7 +27,7 @@ def put_data(
         一个ResponseInfo对象
     """
     crc = crc32(data) if check_crc else None
-    return _form_put(up_token, key, data, params, mime_type, crc, progress_handler)
+    return _form_put(up_token, key, data, params, mime_type, crc, progress_handler, fname)
 
 
 def put_file(up_token, key, file_path, params=None,
@@ -81,6 +81,8 @@ def _form_put(up_token, key, data, params, mime_type, crc, progress_handler=None
     # name = key if key else file_name
 
     fname = file_name
+    if not fname or not fname.strip():
+        fname = 'file_name'
 
     r, info = http._post_file(url, data=fields, files={'file': (fname, data, mime_type)})
     if r is None and info.need_retry():

test_qiniu.py

@@ -64,10 +64,14 @@ def remove_temp_file(file):
         pass
 
 
+def is_travis():
+    return os.environ['QINIU_TEST_ENV'] == 'travis'
+
+
 class UtilsTest(unittest.TestCase):
 
     def test_urlsafe(self):
-        a = '你好\x96'
+        a = 'hello\x96'
         u = urlsafe_base64_encode(a)
         assert b(a) == urlsafe_base64_decode(u)
 
@@ -268,13 +272,14 @@ class UploaderTestCase(unittest.TestCase):
     q = Auth(access_key, secret_key)
 
     def test_put(self):
-        key = 'a\\b\\c"你好'
+        key = 'a\\b\\c"hello'
         data = 'hello bubby!'
         token = self.q.upload_token(bucket_name)
         ret, info = put_data(token, key, data)
         print(info)
         assert ret['key'] == key
 
+    def test_put_crc(self):
         key = ''
         data = 'hello bubby!'
         token = self.q.upload_token(bucket_name, key)
@@ -359,6 +364,39 @@ def test_hasRead_WithoutSeek_retry2(self):
         assert ret is None
         qiniu.set_default(default_zone=qiniu.config.zone0)
 
+    def test_putData_without_fname(self):
+        if is_travis():
+            return
+        localfile = create_temp_file(30 * 1024 * 1024)
+        key = 'test_putData_without_fname'
+        with open(localfile, 'rb') as input_stream:
+            token = self.q.upload_token(bucket_name)
+            ret, info = put_data(token, key, input_stream)
+            print(info)
+            assert ret is not None
+
+    def test_putData_without_fname1(self):
+        if is_travis():
+            return
+        localfile = create_temp_file(30 * 1024 * 1024)
+        key = 'test_putData_without_fname1'
+        with open(localfile, 'rb') as input_stream:
+            token = self.q.upload_token(bucket_name)
+            ret, info = put_data(token, key, input_stream, self.params, self.mime_type, False, None, "")
+            print(info)
+            assert ret is not None
+
+    def test_putData_without_fname2(self):
+        if is_travis():
+            return
+        localfile = create_temp_file(30 * 1024 * 1024)
+        key = 'test_putData_without_fname2'
+        with open(localfile, 'rb') as input_stream:
+            token = self.q.upload_token(bucket_name)
+            ret, info = put_data(token, key, input_stream, self.params, self.mime_type, False, None, "  ")
+            print(info)
+            assert ret is not None
+
 
 class ResumableUploaderTestCase(unittest.TestCase):