fixed mkfile host, add exept catch

Author: longbai

qiniu/io.py

@@ -53,8 +53,7 @@ def put(uptoken, key, data, extra=None):
         {'filename': fname, 'data': data, 'mime_type': extra.mime_type},
     ]
     ret, err, code = rpc.Client(conf.UP_HOST).call_with_multipart("/", fields, files)
-    print err
-    if err is None or code == 571 or code == 614:
+    if err is None or code == 571 or code == 614 or code == 301:
         return ret, err
 
     ret, err, code = rpc.Client(conf.UP_HOST2).call_with_multipart("/", fields, files)

qiniu/resumable_io.py

@@ -76,9 +76,12 @@ def put(uptoken, key, f, fsize, extra):
         print("extra must the instance of PutExtra")
         return
     host = conf.UP_HOST
-    ret, err, code = put_with_host(uptoken, key, f, fsize, extra, host)
-    if err is None or code == 571 or code == 614:
-        return ret, err
+    try:
+        ret, err, code = put_with_host(uptoken, key, f, fsize, extra, host)
+        if err is None or code == 571 or code == 614 or code == 301:
+            return ret, err
+    except:
+        pass
 
     ret, err, code = put_with_host(uptoken, key, f, fsize, extra, conf.UP_HOST2)
     return ret, err
@@ -90,7 +93,7 @@ def put_with_host(uptoken, key, f, fsize, extra, host):
         extra.progresses = [None] * block_cnt
     else:
         if not len(extra.progresses) == block_cnt:
-            return None, err_invalid_put_progress
+            return None, err_invalid_put_progress, 0
 
     if extra.try_times is None:
         extra.try_times = _try_times
@@ -111,12 +114,13 @@ def put_with_host(uptoken, key, f, fsize, extra, host):
 
             try_time -= 1
             if try_time <= 0:
-                return None, err_put_failed
+                return None, err_put_failed, 0
             print err, ".. retry"
 
     mkfile_host = extra.progresses[-1]["host"] if block_cnt else host
     mkfile_client = auth_up.Client(uptoken, mkfile_host)
-    return mkfile(mkfile_client, key, fsize, extra, mkfile_host)
+
+    return mkfile(mkfile_client, key, fsize, extra, host)
 
 def resumable_block_put(block, index, extra, uptoken, host):
     block_size = len(block)

qiniu/rpc.py

@@ -53,7 +53,7 @@ def call_with(self, path, body, content_type=None, content_length=None):
         except ValueError:
             pass
 
-        if resp.status / 100 != 2:
+        if resp.status >= 400:
             err_msg = ret if "error" not in ret else ret["error"]
             reqid = resp.getheader("X-Reqid", None)
             # detail = resp.getheader("x-log", None)

qiniu/test/resumable_io_test.py

@@ -58,7 +58,7 @@ def test_block(self):
 
         key = u"sdk_py_resumable_block_4_%s" % r(9)
         ret, err, code = resumable_io.mkfile(client, key, lens, extra, host)
-        assert err is None
+        assert err is None, err
         self.assertEqual(
             ret["hash"], "FtCFo0mQugW98uaPYgr54Vb1QsO0", "hash not match")
         rs.Client().delete(bucket, key)
@@ -85,7 +85,7 @@ def test_put(self):
         ret, err = resumable_io.put_file(policy.token(), key, localfile, extra)
         dst.close()
         os.remove(tmpf)
-        assert err is None
+        assert err is None, err
         assert ret.get("x:foo") == "test", "return data not contains 'x:foo'"
         self.assertEqual(
             ret["hash"], "FnyTMUqPNRTdk1Wou7oLqDHkBm_p", "hash not match")
@@ -112,7 +112,6 @@ def test_put_4m(self):
         ret, err = resumable_io.put_file(policy.token(), key, localfile, extra)
         dst.close()
         os.remove(tmpf)
-        print err
         assert err is None, err
         assert ret.get("x:foo") == "test", "return data not contains 'x:foo'"
         self.assertEqual(