Merge pull request #123 from qiniu/develop

Release 6.1.7

Author: longbai

qiniu/conf.py

@@ -5,7 +5,7 @@
 
 RS_HOST = "rs.qbox.me"
 RSF_HOST = "rsf.qbox.me"
-UP_HOST = "up.qiniu.com"
+UP_HOST = "upload.qiniu.com"
 UP_HOST2 = "up.qbox.me"
 
 from . import __version__

qiniu/io.py

@@ -53,7 +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)
-    if err is None or code == 571 or code == 614 or code == 301:
+    if err is None or code / 100 == 4 or code == 579 or code / 100 == 6 or code / 100 == 7:
         return ret, err
 
     ret, err, code = rpc.Client(conf.UP_HOST2).call_with_multipart("/", fields, files)

qiniu/resumable_io.py

@@ -79,7 +79,7 @@ def put(uptoken, key, f, fsize, extra):
     host = conf.UP_HOST
     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:
+        if err is None or code / 100 == 4 or code == 579 or code / 100 == 6 or code / 100 == 7:
             return ret, err
     except:
         pass

qiniu/test/io_test.py

@@ -177,17 +177,6 @@ def test_put_fail_reqid(self):
         ret, err = io.put("", key, data, extra)
         assert "reqid" in err
 
-    def test_put_with_uphost2(self):
-        conf.UP_HOST = "api.qiniu.com"  # mistake up host
-        localfile = "%s" % __file__
-        key = "test_up2_%s" % r(9)
-
-        extra.check_crc = 1
-        ret, err = io.put_file(policy.token(), key, localfile, extra)
-        assert err is None
-        assert ret['key'] == key
-        conf.UP_HOST = "up.qiniu.com"
-
 
 class Test_get_file_crc32(unittest.TestCase):