Merge pull request #83 from xzzpig/master

修复上传下载失败的问题

baidupcsapi/api.py

@@ -125,6 +125,9 @@ def check_login(func):
     def wrapper(*args, **kwargs):
         ret = func(*args, **kwargs)
         if type(ret) == requests.Response:
+            # 检测结果是否为JSON
+            if ret.content[0]!=b'{' and ret.content[0]!=b'[':
+                return ret
             try:
                 foo = json.loads(ret.content.decode('utf-8'))
                 if 'errno' in foo and foo['errno'] == -6:
@@ -552,7 +555,7 @@ def quota(self, **kwargs):
         """
         return self._request('quota', **kwargs)
 
-    def upload(self, dest_dir, file_handler, filename, ondup="newcopy", callback=None, **kwargs):
+    def upload(self, dest_dir, file_handler, filename, callback=None, **kwargs):
         """上传单个文件（<2G）.
 
         | 百度PCS服务目前支持最大2G的单个文件上传。
@@ -578,11 +581,6 @@ def upload(self, dest_dir, file_handler, filename, ondup="newcopy", callback=Non
 
         :param filename:
 
-        :param ondup: （可选）
-
-                      * 'overwrite'：表示覆盖同名文件；
-                      * 'newcopy'：表示生成文件副本并进行重命名，命名规则为“
-                        文件名_日期.后缀”。
         :return: requests.Response 对象
 
             .. note::
@@ -593,9 +591,7 @@ def upload(self, dest_dir, file_handler, filename, ondup="newcopy", callback=Non
         """
 
         params = {
-            'dest_dir': dest_dir,
-            'ondup': ondup,
-            'filename': filename
+            'path':str(dest_dir)+"/"+str(filename)
         }
 
         tmp_filename = ''.join(random.sample(string.ascii_letters, 10))

examples/remote_download.py

@@ -40,7 +40,7 @@ def __init__(self,
             'timeout': 60,
         }
 
-    def ruokuai_captcha_handler(s, params, image_url):
+    def ruokuai_captcha_handler(self, params, image_url):
         """
             若快自动识别验证码, 文档见: http://wiki.ruokuai.com/
         """