Skip to content

Commit 1ade3c2

Browse files
author
YangSen-qn
committed
custom deprecated
1 parent 1e56343 commit 1ade3c2

File tree

3 files changed

+24
-11
lines changed

3 files changed

+24
-11
lines changed

qiniu/services/storage/legacy.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
import os
44
import time
55

6-
from typing_extensions import deprecated
7-
86
from qiniu import config, http
97
from qiniu.auth import Auth
108
from qiniu.compat import json
11-
from qiniu.utils import _file_iter, crc32, rfc_from_timestamp, urlsafe_base64_encode
9+
from qiniu.utils import _file_iter, crc32, rfc_from_timestamp, urlsafe_base64_encode, deprecated
1210

1311
from qiniu.services.storage.upload_progress_recorder import UploadProgressRecorder
1412

13+
1514
@deprecated("use uploader instead")
1615
class _Resume(object):
1716
"""deprecated 断点续上传类
@@ -87,7 +86,7 @@ def recovery_from_record(self):
8786
return 0, None, None
8887
try:
8988
if not record['modify_time'] or record['size'] != self.size or \
90-
record['modify_time'] != self.modify_time:
89+
record['modify_time'] != self.modify_time:
9190
if self.version == 'v1':
9291
return 0
9392
elif self.version == 'v2':
@@ -108,8 +107,8 @@ def recovery_from_record(self):
108107
return record['offset']
109108
elif self.version == 'v2':
110109
if not record.__contains__('etags') or len(record['etags']) == 0 or \
111-
not record.__contains__('expired_at') or float(record['expired_at']) < time.time() or \
112-
not record.__contains__('upload_id'):
110+
not record.__contains__('expired_at') or float(record['expired_at']) < time.time() or \
111+
not record.__contains__('upload_id'):
113112
return 0, None, None
114113
self.blockStatus = record['etags']
115114
return record['offset'], record['upload_id'], record['expired_at']
@@ -180,7 +179,7 @@ def _upload_v2(self):
180179
offset, self.uploadId, self.expiredAt = self.recovery_from_record()
181180
is_resumed = False
182181
if offset > 0 and self.blockStatus != [] and self.uploadId is not None \
183-
and self.expiredAt is not None:
182+
and self.expiredAt is not None:
184183
self.recovery_index = self.blockStatus[-1]['partNumber'] + 1
185184
is_resumed = True
186185
else:
@@ -203,7 +202,7 @@ def _upload_v2(self):
203202
if config.get_default('default_zone').up_host_backup:
204203
host = config.get_default('default_zone').up_host_backup
205204
else:
206-
host = config.get_default('default_zone')\
205+
host = config.get_default('default_zone') \
207206
.get_up_host_backup_by_token(self.up_token, self.hostscache_dir)
208207

209208
if info.need_retry():

qiniu/services/storage/uploader.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
# -*- coding: utf-8 -*-
22
import os
33

4-
from typing_extensions import deprecated
5-
64
from qiniu.config import _BLOCK_SIZE, get_default
75

86
from qiniu.auth import Auth
9-
from qiniu.utils import crc32, file_crc32, rfc_from_timestamp
7+
from qiniu.utils import crc32, file_crc32, rfc_from_timestamp, deprecated
108

119
from qiniu.services.storage.uploaders import FormUploader, ResumeUploaderV1, ResumeUploaderV2
1210
from qiniu.services.storage.upload_progress_recorder import UploadProgressRecorder

qiniu/utils.py

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# -*- coding: utf-8 -*-
2+
import warnings
3+
from functools import wraps
24
from hashlib import sha1, new as hashlib_new
35
from base64 import urlsafe_b64encode, urlsafe_b64decode
46
from datetime import datetime, tzinfo, timedelta
@@ -264,3 +266,17 @@ def dt2ts(dt):
264266
st = (dt - datetime(1970, 1, 1, tzinfo=_UTC_TZINFO())).total_seconds()
265267

266268
return int(st)
269+
270+
271+
def deprecated(reason):
272+
def decorator(func):
273+
@wraps(func)
274+
def wrapper(*args, **kwargs):
275+
warnings.warn(
276+
"DEPRECATED: {} - {}".format(func.__name__, reason),
277+
DeprecationWarning,
278+
stacklevel=2
279+
)
280+
return func(*args, **kwargs)
281+
return wrapper
282+
return decorator

0 commit comments

Comments
 (0)