add futures for python2.7

Author: lihsai0

.github/workflows/ci-test.yml

@@ -39,7 +39,7 @@ jobs:
         shell: bash -l {0}
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --ignore-installed "coverage<7.2" flake8 pytest pytest-cov freezegun requests scrutinizer-ocular codecov
+          python -m pip install -I -e ".[dev]"
       - name: Run cases
         shell: bash -l {0}
         env:

qiniu/compat.py

@@ -51,6 +51,13 @@ def s(data):
     def u(data):
         return unicode(data, 'unicode_escape')  # noqa
 
+    def is_seekable(data):
+        try:
+            data.seek(0, 1)
+            return True
+        except (AttributeError, IOError):
+            return False
+
 elif is_py3:
     from urllib.parse import urlparse  # noqa
     import io
@@ -75,3 +82,6 @@ def s(data):
 
     def u(data):
         return data
+
+    def is_seekable(data):
+        return data.seekable()

qiniu/services/storage/legacy.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import hashlib
 import time
 

qiniu/services/storage/uploader.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
 
-from qiniu import config
+from qiniu.config import _BLOCK_SIZE, get_default
 
 from qiniu.auth import Auth
 from qiniu.utils import crc32, file_crc32, rfc_from_timestamp
@@ -37,7 +37,7 @@ def put_data(
     final_data = b''
     if hasattr(data, 'read'):
         while True:
-            tmp_data = data.read(config._BLOCK_SIZE)
+            tmp_data = data.read(_BLOCK_SIZE)
             if len(tmp_data) == 0:
                 break
             else:
@@ -84,7 +84,7 @@ def put_file(
     with open(file_path, 'rb') as input_stream:
         file_name = os.path.basename(file_path)
         modify_time = int(os.path.getmtime(file_path))
-        if size > config.get_default('default_upload_threshold'):
+        if size > get_default('default_upload_threshold'):
             ret, info = put_stream(
                 up_token, key, input_stream, file_name, size, hostscache_dir, params,
                 mime_type, progress_handler,

qiniu/services/storage/uploaders/abc/resume_uploader_base.py

@@ -32,7 +32,7 @@ def __init__(
         concurrent_executor: futures.Executor
         kwargs
         """
-        super().__init__(bucket_name, **kwargs)
+        super(ResumeUploaderBase, self).__init__(bucket_name, **kwargs)
 
         self.part_size = kwargs.get('part_size', 4 * (1024 ** 2))
 

qiniu/services/storage/uploaders/abc/uploader_base.py

@@ -6,7 +6,7 @@
 from qiniu.auth import Auth # noqa
 
 
-class UploaderBase:
+class UploaderBase(object):
     """
     Attributes
     ----------
@@ -33,8 +33,6 @@ def __init__(
         kwargs
             The others arguments may be used by subclass.
         """
-        super().__init__()
-
         self.bucket_name = bucket_name
 
         # change the default when implements AuthProvider

qiniu/services/storage/uploaders/form_uploader.py

@@ -2,6 +2,7 @@
 from os import path
 from time import time
 
+from qiniu.compat import is_seekable
 from qiniu.utils import b, io_crc32
 from qiniu.auth import Auth
 from qiniu.http import qn_http_client
@@ -18,7 +19,7 @@ def __init__(self, bucket_name, **kwargs):
         kwargs
             auth, regions
         """
-        super().__init__(bucket_name, **kwargs)
+        super(FormUploader, self).__init__(bucket_name, **kwargs)
 
         self.progress_handler = kwargs.get(
             'progress_handler',
@@ -162,7 +163,7 @@ def __upload_data(
             if resp.ok() and ret:
                 return ret, resp
             if (
-                not data.seekable() or
+                not is_seekable(data) or
                 not resp.need_retry()
             ):
                 return ret, resp
@@ -231,7 +232,7 @@ def __get_file_crc32(self, data):
         str
         """
         result = None
-        if not data.seekable():
+        if not is_seekable(data):
             return result
         result = io_crc32(data)
         data.seek(0)

qiniu/services/storage/uploaders/io_chunked.py

@@ -1,6 +1,8 @@
 import io
 from collections import namedtuple
 
+from qiniu.compat import is_seekable
+
 
 ChunkInfo = namedtuple(
     'ChunkInfo',
@@ -21,7 +23,7 @@ def __init__(
         lock,
         buffer_size=4 * (1024 ** 2)  # 4MB just for demo
     ):
-        if not base_io.seekable():
+        if not is_seekable(base_io):
             raise TypeError('"base_io" must be seekable')
         self.__base_io = base_io
         self.__chunk_start = chunk_offset

qiniu/services/storage/uploaders/resume_uploader_v1.py

@@ -7,6 +7,7 @@
 from threading import Lock
 from time import time
 
+from qiniu.compat import is_seekable
 from qiniu.auth import Auth
 from qiniu.http import qn_http_client, ResponseInfo
 from qiniu.utils import b, io_crc32, urlsafe_base64_encode
@@ -585,7 +586,7 @@ def __upload_part(
                 )
                 return part, resp
             if (
-                not chunked_data.seekable() or
+                not is_seekable(chunked_data) or
                 not resp.need_retry()
             ):
                 return part, resp

qiniu/services/storage/uploaders/resume_uploader_v2.py

@@ -5,6 +5,7 @@
 from threading import Lock
 from time import time
 
+from qiniu.compat import is_seekable
 from qiniu.auth import Auth
 from qiniu.http import qn_http_client, ResponseInfo
 from qiniu.utils import b, io_md5, urlsafe_base64_encode
@@ -694,7 +695,7 @@ def __upload_part(
                 )
                 return part, resp
             if (
-                not chunked_data.seekable() or
+                not is_seekable(chunked_data) or
                 not resp.need_retry()
             ):
                 return part, resp

setup.py

@@ -54,12 +54,13 @@ def find_version(*file_paths):
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
     install_requires=[
-        'requests'
+        'requests',
+        'futures; python_version == "2.7"'
     ],
     extras_require={
         'dev': [
             'coverage<7.2',
-            'flask8',
+            'flake8',
             'pytest',
             'pytest-cov',
             'freezegun',