From 51497be3d9326ab584410fd0af5c148d659f21d6 Mon Sep 17 00:00:00 2001 From: tiedu Date: Fri, 23 Aug 2019 16:23:38 +0800 Subject: [PATCH 1/2] add proxies --- qcloud_cos/cos_client.py | 14 ++++++++------ qcloud_cos/version.py | 2 +- setup.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/qcloud_cos/cos_client.py b/qcloud_cos/cos_client.py index d3ba6194..874126a0 100644 --- a/qcloud_cos/cos_client.py +++ b/qcloud_cos/cos_client.py @@ -31,7 +31,7 @@ class CosConfig(object): """config类，保存用户相关信息""" def __init__(self, Appid=None, Region=None, SecretId=None, SecretKey=None, Token=None, Scheme=None, Timeout=None, Access_id=None, Access_key=None, Secret_id=None, Secret_key=None, - Endpoint=None, IP=None, Port=None, Anonymous=None, UA=None): + Endpoint=None, IP=None, Port=None, Anonymous=None, UA=None, Proxies=None): """初始化，保存用户的信息 :param Appid(string): 用户APPID. @@ -50,6 +50,7 @@ def __init__(self, Appid=None, Region=None, SecretId=None, SecretKey=None, Token :param Port(int): 访问COS的port :param Anonymous(bool): 是否使用匿名访问COS :param UA(string): 使用自定义的UA来访问COS + :param Proxies(dict): 使用代理来访问COS """ self._appid = to_unicode(Appid) self._token = to_unicode(Token) @@ -60,6 +61,7 @@ def __init__(self, Appid=None, Region=None, SecretId=None, SecretKey=None, Token self._port = Port self._anonymous = Anonymous self._ua = UA + self._proxies = Proxies if Scheme is None: Scheme = u'https' @@ -217,15 +219,15 @@ def send_request(self, method, url, bucket, timeout=30, **kwargs): for j in range(self._retry + 1): try: if method == 'POST': - res = self._session.post(url, timeout=timeout, **kwargs) + res = self._session.post(url, timeout=timeout, proxies=self._conf.proxies, **kwargs) elif method == 'GET': - res = self._session.get(url, timeout=timeout, **kwargs) + res = self._session.get(url, timeout=timeout, proxies=self._conf.proxies, **kwargs) elif method == 'PUT': - res = self._session.put(url, timeout=timeout, **kwargs) + res = self._session.put(url, timeout=timeout, proxies=self._conf.proxies, **kwargs) elif method == 'DELETE': - res = self._session.delete(url, timeout=timeout, **kwargs) + res = self._session.delete(url, timeout=timeout, proxies=self._conf.proxies, **kwargs) elif method == 'HEAD': - res = self._session.head(url, timeout=timeout, **kwargs) + res = self._session.head(url, timeout=timeout, proxies=self._conf.proxies, **kwargs) if res.status_code < 400: # 2xx和3xx都认为是成功的 return res except Exception as e: # 捕获requests抛出的如timeout等客户端错误,转化为客户端错误 diff --git a/qcloud_cos/version.py b/qcloud_cos/version.py index 267837ae..27a25bc7 100644 --- a/qcloud_cos/version.py +++ b/qcloud_cos/version.py @@ -1,2 +1,2 @@ -__version__ = '5.1.7.3' +__version__ = '5.1.7.4' diff --git a/setup.py b/setup.py index 184bbb9f..beb52d23 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ def long_description(): setup( name='cos-python-sdk-v5', - version='1.7.3', + version='1.7.4', url='https://www.qcloud.com/', license='MIT', author='tiedu, lewzylu, channingliu', From faf288fef9dcf163b7b65d12263f83d16106b5ce Mon Sep 17 00:00:00 2001 From: tiedu Date: Fri, 23 Aug 2019 16:27:16 +0800 Subject: [PATCH 2/2] add proxies --- qcloud_cos/cos_client.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qcloud_cos/cos_client.py b/qcloud_cos/cos_client.py index 874126a0..97fd5557 100644 --- a/qcloud_cos/cos_client.py +++ b/qcloud_cos/cos_client.py @@ -219,15 +219,15 @@ def send_request(self, method, url, bucket, timeout=30, **kwargs): for j in range(self._retry + 1): try: if method == 'POST': - res = self._session.post(url, timeout=timeout, proxies=self._conf.proxies, **kwargs) + res = self._session.post(url, timeout=timeout, proxies=self._conf._proxies, **kwargs) elif method == 'GET': - res = self._session.get(url, timeout=timeout, proxies=self._conf.proxies, **kwargs) + res = self._session.get(url, timeout=timeout, proxies=self._conf._proxies, **kwargs) elif method == 'PUT': - res = self._session.put(url, timeout=timeout, proxies=self._conf.proxies, **kwargs) + res = self._session.put(url, timeout=timeout, proxies=self._conf._proxies, **kwargs) elif method == 'DELETE': - res = self._session.delete(url, timeout=timeout, proxies=self._conf.proxies, **kwargs) + res = self._session.delete(url, timeout=timeout, proxies=self._conf._proxies, **kwargs) elif method == 'HEAD': - res = self._session.head(url, timeout=timeout, proxies=self._conf.proxies, **kwargs) + res = self._session.head(url, timeout=timeout, proxies=self._conf._proxies, **kwargs) if res.status_code < 400: # 2xx和3xx都认为是成功的 return res except Exception as e: # 捕获requests抛出的如timeout等客户端错误,转化为客户端错误