Merge pull request #200 from DomainTools/idev-2456-ignore-account-info-rate-limit

IDEV-2546 Python wrapper used in any integration may cause a rate limit issue due to account rate limit checking

Author: wesleya

domaintools/api.py

@@ -34,6 +34,7 @@
     filter_by_field,
     DTResultFilter,
 )
+from domaintools.exceptions import ServiceUnavailableException, ServiceException
 from domaintools.utils import validate_feeds_parameters
 
 
@@ -163,7 +164,12 @@ def _results(self, product, path, cls=Results, **kwargs):
         if product != "account-information" and self.rate_limit and not self.limits_set and not self.limits:
             always_sign_api_key_previous_value = self.always_sign_api_key
             header_authentication_previous_value = self.header_authentication
-            self._rate_limit(product)
+            try:
+                self._rate_limit(product)
+            except (ServiceUnavailableException, ServiceException):
+                # If account_information fails (e.g. rate limited itself),
+                # skip client-side rate limiting and proceed with the original call.
+                self.limits_set = True
             # Reset always_sign_api_key and header_authentication to its original
             # User-set values as these might be affected when self.account_information() was executed
             self.always_sign_api_key = always_sign_api_key_previous_value

domaintools/base_results.py

@@ -140,7 +140,7 @@ def _get_results(self):
         wait_for = self._wait_time()
         if self.api.rate_limit and (wait_for is None or self.product == "account-information"):
             data = self._make_request()
-            if data.status_code == 503:  # pragma: no cover
+            if data.status_code == 503 and self.product != "account-information":  # pragma: no cover
                 sleeptime = 60
                 log.info(
                     "503 encountered for [%s] - sleeping [%s] seconds before retrying request.",