Adding a extra_request_params condition

Author: CAMIRO

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.extra_request_params['proxies'] = {'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,10 @@ def _wait_time(self):
         return wait_for
 
     def _make_request(self):
-        proxies = self.api.extra_request_params.pop('proxies') or None
+        if self.api.extra_request_params:
+            proxies = self.api.extra_request_params.pop('proxies')
+        else: 
+            proxies = None
         with Client(verify=self.api.verify_ssl, proxies=proxies, timeout=None) as session:
             if self.product in ['iris-investigate', 'iris-enrich', 'iris-detect-escalate-domains']:
                 post_data = self.kwargs.copy()

domaintools_async/__init__.py

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

tests/test_api.py

@@ -18,7 +18,6 @@ def test_account_information():
             assert 'absolute_limit' in product
             assert 'usage' in product
             assert 'expiration_date' in product
-            assert 'proxies' in product
 
 
 @vcr.use_cassette