Merge pull request #111 from DomainTools/origin/id-1544-fix-proxy-support

Origin/id 1544 fix proxy support

Author: CAMIRO

.gitignore

@@ -72,3 +72,6 @@ venv/
 
 # Cython
 *.c
+
+# Testing folders
+proxyTest/

domaintools/api.py

@@ -57,7 +57,7 @@ def __init__(self, username, key, https=True, verify_ssl=True, rate_limit=True,
             raise Exception("The DomainTools API endpoints no longer support http traffic. Please make sure https=True.")
         if proxy_url:
             if isinstance(proxy_url, str):
-                self.extra_request_params['proxies'] = {'http': proxy_url, 'https': proxy_url}
+                self.proxy_url = {'http://': proxy_url, 'https://': proxy_url}
             else:
                 raise Exception("Proxy URL must be a string. For example: '127.0.0.1:8888'")
 

domaintools/base_results.py

@@ -57,7 +57,8 @@ def _wait_time(self):
         return wait_for
 
     def _make_request(self):
-        with Client(verify=self.api.verify_ssl, proxies=self.api.extra_request_params.get('proxies'), timeout=None) as session:
+
+        with Client(verify=self.api.verify_ssl, proxies=self.api.proxy_url, timeout=None) as session:
             if self.product in ['iris-investigate', 'iris-enrich', 'iris-detect-escalate-domains']:
                 post_data = self.kwargs.copy()
                 post_data.update(self.api.extra_request_params)

domaintools_async/__init__.py

@@ -59,7 +59,8 @@ async def _make_async_request(self, session):
 
     async def __awaitable__(self):
         if self._data is None:
-            async with AsyncClient(verify=self.api.verify_ssl, proxies=self.api.extra_request_params.get('proxies'), timeout=None) as session:
+
+            async with AsyncClient(verify=self.api.verify_ssl, proxies=self.api.proxy_url, timeout=None) as session:
                 wait_time = self._wait_time()
                 if wait_time is None and self.api:
                     try: