"resume up api version default to v2"

This reverts commit a0b01d0.

Author: YangSen-qn

.gitignore

@@ -4,7 +4,6 @@
 
 *.py[cod]
 
-tests/cases/env
 my-test-env.sh
 
 ##

examples/upload.py

@@ -2,7 +2,7 @@
 # flake8: noqa
 # import hashlib
 
-from qiniu import Auth, put_file_v2, urlsafe_base64_encode
+from qiniu import Auth, put_file, urlsafe_base64_encode
 import qiniu.config
 from qiniu.compat import is_py2, is_py3
 
@@ -37,7 +37,7 @@
 #     'x-qn-meta-md5': hasher.hexdigest()
 # }
 
-ret, info = put_file_v2(
+ret, info = put_file(
     token,
     key,
     localfile

examples/upload_callback.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 
-from qiniu import Auth, put_file_v2
+from qiniu import Auth, put_file
 
 access_key = '...'
 secret_key = '...'
@@ -22,6 +22,6 @@
 
 localfile = './sync/bbb.jpg'
 
-ret, info = put_file_v2(token, key, localfile)
+ret, info = put_file(token, key, localfile)
 print(info)
 assert ret['key'] == key

examples/upload_pfops.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
-from qiniu import Auth, urlsafe_base64_encode, put_file_v2
+from qiniu import Auth, put_file, urlsafe_base64_encode
 
 access_key = '...'
 secret_key = '...'
@@ -33,6 +33,6 @@
 
 localfile = './python_video.flv'
 
-ret, info = put_file_v2(token, key, localfile)
+ret, info = put_file(token, key, localfile)
 print(info)
 assert ret['key'] == key

examples/upload_with_qvmzone.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 
-from qiniu import Auth, put_file_v2
+from qiniu import Auth, put_file, urlsafe_base64_encode
 import qiniu.config
 from qiniu import Zone, set_default
 
@@ -34,6 +34,6 @@
     scheme='http')
 set_default(default_zone=zone)
 
-ret, info = put_file_v2(token, key, localfile)
+ret, info = put_file(token, key, localfile)
 print(info)
 assert ret['key'] == key

examples/upload_with_zone.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # flake8: noqa
 
-from qiniu import Auth, put_file_v2
+from qiniu import Auth, put_file
 from qiniu import Zone, set_default
 
 # 需要填写你的 Access Key 和 Secret Key
@@ -38,5 +38,5 @@
     scheme='https')
 set_default(default_zone=zone)
 
-ret, info = put_file_v2(token, key, localfile)
+ret, info = put_file(token, key, localfile)
 print(info)

qiniu/__init__.py

@@ -19,7 +19,7 @@
 
 from .services.storage.bucket import BucketManager, build_batch_copy, build_batch_rename, build_batch_move, \
     build_batch_stat, build_batch_delete, build_batch_restoreAr, build_batch_restore_ar
-from .services.storage.uploader import put_data, put_file, put_file_v2, put_stream, put_stream_v2
+from .services.storage.uploader import put_data, put_file, put_stream
 from .services.storage.upload_progress_recorder import UploadProgressRecorder
 from .services.cdn.manager import CdnManager, DataType, create_timestamp_anti_leech_url, DomainManager
 from .services.processing.pfop import PersistentFop

qiniu/services/storage/legacy.py

@@ -3,16 +3,14 @@
 import os
 import time
 
-from typing_extensions import deprecated
-
 from qiniu import config, http
 from qiniu.auth import Auth
 from qiniu.compat import json
 from qiniu.utils import _file_iter, crc32, rfc_from_timestamp, urlsafe_base64_encode
 
 from qiniu.services.storage.upload_progress_recorder import UploadProgressRecorder
 
-@deprecated("use uploader instead")
+
 class _Resume(object):
     """deprecated 断点续上传类