fix(proxy): remove no proxy

Author: bytestarter

SDK_Integration_zh.md

@@ -14,7 +14,6 @@
   - [指定scheme](#指定scheme)
 - [Http(s)代理配置](#https代理配置)
   - [配置Http(s)代理](#配置https代理)
-  - [配置No Proxy](#配置no-proxy)
   - [注意事项](#注意事项)
   - [忽略SSL验证](#忽略ssl验证)
 - [超时配置](#超时配置)
@@ -258,22 +257,6 @@ volcenginesdkcore.Configuration.set_default(configuration)
 api_instance = volcenginesdkecs.ECSApi()
 ```
 
-## 配置No Proxy
-
-```python
-configuration = volcenginesdkcore.Configuration()
-configuration.ak = "Your AK"
-configuration.sk = "Your SK"
-
-configuration.http_proxy = "http://your_proxy:8080"
-configuration.https_proxy = "http://your_proxy:8080"
-configuration.no_proxy = "host1_without_proxy,host2_without_proxy"
-
-volcenginesdkcore.Configuration.set_default(configuration)
-
-api_instance = volcenginesdkecs.ECSApi()
-```
-
 ## 注意事项
 
 支持通过以下环境变量配置代理:

volcenginesdkcore/configuration.py

@@ -129,7 +129,6 @@ def __init__(self):
         self.proxy = None
         self.http_proxy = None
         self.https_proxy = None
-        self.no_proxy = None
 
         # Safe chars for path_param
         self.safe_chars_for_path_param = ''

volcenginesdkcore/rest.py

@@ -40,19 +40,6 @@ def getheader(self, name, default=None):
         """Returns a given response header."""
         return self.urllib3_response.getheader(name, default)
 
-
-def _get_no_proxy(configuration):
-    n1 = os.environ.get('NO_PROXY')
-    n2 = os.environ.get('no_proxy')
-    if configuration.no_proxy:
-        return configuration.no_proxy.split(',')
-    elif n1:
-        return n1.split(',')
-    elif n2:
-        return n2.split(',')
-    return []
-
-
 class RESTClientObject(object):
 
     def __init__(self, configuration, pools_size=4, maxsize=None):
@@ -62,18 +49,7 @@ def __init__(self, configuration, pools_size=4, maxsize=None):
         # maxsize is the number of requests to host that are allowed in parallel  # noqa: E501
         # Custom SSL certificates and client certificates: http://urllib3.readthedocs.io/en/latest/advanced-usage.html  # noqa: E501
 
-        self._configuration = configuration
-        self._last_pm_proxy_url = None
-        self._pools_size = pools_size
-        self._maxsize = maxsize
-        self._lock = threading.Lock()
-        self.pool_manager = None
-
-    def __init_pool_manager(self, configuration, host, pools_size, maxsize):
-
-        proxy_url = self.__get_proxy(host)
-        if proxy_url == self._last_pm_proxy_url and self.pool_manager:
-            return
+        proxy_url = self.__get_proxy(configuration)
 
         # cert_reqs
         if configuration.verify_ssl:
@@ -134,12 +110,9 @@ def __init_pool_manager(self, configuration, host, pools_size, maxsize):
 
         self._last_pm_proxy_url = proxy_url
 
-    def __get_proxy(self, host):
-        configuration = self._configuration
+    def __get_proxy(self, configuration):
         proxy_url = configuration.proxy
-        if host in _get_no_proxy(configuration):
-            proxy_url = None
-        elif not configuration.proxy:
+        if not proxy_url:
             if configuration.scheme == 'http':
                 if configuration.http_proxy:
                     proxy_url = configuration.http_proxy
@@ -205,10 +178,6 @@ def request(self, method, url, query_params=None, headers=None,
         if 'Content-Type' not in headers:
             headers['Content-Type'] = 'application/json'
 
-        host = headers.get('Host')
-        with self._lock:
-            self.__init_pool_manager(self._configuration, host, self._pools_size, self._maxsize)
-
         try:
             # For `POST`, `PUT`, `PATCH`, `OPTIONS`, `DELETE`
             if method in ['POST', 'PUT', 'PATCH', 'OPTIONS', 'DELETE']: