Allow Retry class to determine to retry based on response

changelog/1445.feature.rst

@@ -0,0 +1 @@
+Added `is_response_retry` variation of `Retry.is_retry` that considers `HTTPResponse`.

src/urllib3/connectionpool.py

@@ -932,8 +932,7 @@ def urlopen(  # type: ignore[override]
             )
 
         # Check if we should retry the HTTP response.
-        has_retry_after = bool(response.headers.get("Retry-After"))
-        if retries.is_retry(method, response.status, has_retry_after):
+        if retries.is_response_retry(method, response):
             try:
                 retries = retries.increment(method, url, response=response, _pool=self)
             except MaxRetryError:

src/urllib3/util/retry.py

@@ -380,6 +380,16 @@ def _is_method_retryable(self, method: str) -> bool:
             return False
         return True
 
+    def is_response_retry(self, method: str, response: BaseHTTPResponse) -> bool:
+        """Is this method/response retryable? (Based on allowlists and control
+        variables such as the number of total retries to allow, whether to
+        respect the Retry-After header, whether this header is present, and
+        whether the returned status code is on the list of status codes to
+        be retried upon on the presence of the aforementioned header)
+        """
+        has_retry_after = bool(response.headers.get("Retry-After"))
+        return self.is_retry(method, response.status, has_retry_after)
+
     def is_retry(
         self, method: str, status_code: int, has_retry_after: bool = False
     ) -> bool:

test/test_retry.py

@@ -239,27 +239,37 @@ def test_sleep(self) -> None:
     def test_status_forcelist(self) -> None:
         retry = Retry(status_forcelist=range(500, 600))
         assert not retry.is_retry("GET", status_code=200)
+        assert not retry.is_response_retry("GET", HTTPResponse(status=200))
         assert not retry.is_retry("GET", status_code=400)
+        assert not retry.is_response_retry("GET", HTTPResponse(status=400))
         assert retry.is_retry("GET", status_code=500)
+        assert retry.is_response_retry("GET", HTTPResponse(status=500))
 
         retry = Retry(total=1, status_forcelist=[418])
         assert not retry.is_retry("GET", status_code=400)
+        assert not retry.is_response_retry("GET", HTTPResponse(status=400))
         assert retry.is_retry("GET", status_code=418)
+        assert retry.is_response_retry("GET", HTTPResponse(status=418))
 
         # String status codes are not matched.
         retry = Retry(total=1, status_forcelist=["418"])  # type: ignore[list-item]
         assert not retry.is_retry("GET", status_code=418)
+        assert not retry.is_response_retry("GET", HTTPResponse(status=418))
 
     def test_allowed_methods_with_status_forcelist(self) -> None:
         # Falsey allowed_methods means to retry on any method.
         retry = Retry(status_forcelist=[500], allowed_methods=None)
         assert retry.is_retry("GET", status_code=500)
+        assert retry.is_response_retry("GET", HTTPResponse(status=500))
         assert retry.is_retry("POST", status_code=500)
+        assert retry.is_response_retry("POST", HTTPResponse(status=500))
 
         # Criteria of allowed_methods and status_forcelist are ANDed.
         retry = Retry(status_forcelist=[500], allowed_methods=["POST"])
         assert not retry.is_retry("GET", status_code=500)
+        assert not retry.is_response_retry("GET", HTTPResponse(status=500))
         assert retry.is_retry("POST", status_code=500)
+        assert retry.is_response_retry("POST", HTTPResponse(status=500))
 
     def test_exhausted(self) -> None:
         assert not Retry(0).is_exhausted()
@@ -411,6 +421,11 @@ def test_respect_retry_after_header_sleep(
                 status=503, headers={"Retry-After": retry_after_header}
             )
 
+            # for the default behaviour, method must be in DEFAULT_ALLOWED_METHODS
+            assert (
+                retry.is_response_retry("GET", response) == respect_retry_after_header
+            )
+
             retry.sleep(response)
 
             # The expected behavior is that we'll only sleep if respecting