diff --git a/.travis.yml b/.travis.yml index d926594e..bdffad6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ python: - '3.6' - '3.8' - '3.9' +- "3.10" install: - pip install requests - pip install six diff --git a/qcloud_cos/cos_client.py b/qcloud_cos/cos_client.py index 953c3ab7..73e66d1f 100644 --- a/qcloud_cos/cos_client.py +++ b/qcloud_cos/cos_client.py @@ -30,6 +30,11 @@ from .select_event_stream import EventStream from .resumable_downloader import ResumableDownLoader +# python 3.10报错"module 'collections' has no attribute 'Iterable'",这里先规避 +if sys.version_info.major >= 3 and sys.version_info.minor >= 10: + import collections.abc + collections.Iterable = collections.abc.Iterable + logger = logging.getLogger(__name__) @@ -253,14 +258,14 @@ def set_built_in_connection_pool_max_size(self, PoolConnections, PoolMaxSize): # 重新绑定到内置连接池 if rebound: self._session = CosS3Client.__built_in_sessions - logger.warn("rebound built-in connection pool success. maxsize=%d,%d" % (PoolConnections, PoolMaxSize)) + logger.info("rebound built-in connection pool success. maxsize=%d,%d" % (PoolConnections, PoolMaxSize)) def generate_built_in_connection_pool(self, PoolConnections, PoolMaxSize): """生成SDK内置的连接池,此连接池是client间共用的""" built_in_sessions = requests.session() built_in_sessions.mount('http://', requests.adapters.HTTPAdapter(pool_connections=PoolConnections, pool_maxsize=PoolMaxSize)) built_in_sessions.mount('https://', requests.adapters.HTTPAdapter(pool_connections=PoolConnections, pool_maxsize=PoolMaxSize)) - logger.warn("generate built-in connection pool success. maxsize=%d,%d" % (PoolConnections, PoolMaxSize)) + logger.info("generate built-in connection pool success. maxsize=%d,%d" % (PoolConnections, PoolMaxSize)) return built_in_sessions def get_conf(self): diff --git a/qcloud_cos/cos_threadpool.py b/qcloud_cos/cos_threadpool.py index 588ca551..dcafecce 100644 --- a/qcloud_cos/cos_threadpool.py +++ b/qcloud_cos/cos_threadpool.py @@ -30,7 +30,7 @@ def run(self): self._ret.append(ret) except Exception as e: - logger.warn(str(e)) + logger.error(str(e)) self._fail_task_num += 1 if hasattr(e, '_message') and e._message: self._ret.append(e._message) diff --git a/qcloud_cos/version.py b/qcloud_cos/version.py index 9a26a643..2585df26 100644 --- a/qcloud_cos/version.py +++ b/qcloud_cos/version.py @@ -1 +1 @@ -__version__ = '5.1.9.19' +__version__ = '5.1.9.20' diff --git a/setup.py b/setup.py index e8706a73..4a76a05b 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ def long_description(): setup( name='cos-python-sdk-v5', - version='1.9.19', + version='1.9.20', url='https://www.qcloud.com/', license='MIT', author='tiedu, lewzylu, channingliu',