From: François Voron <fvoron@gmail.com>
Date: Mon, 20 Jul 2020 12:10:57 +0000 (+0200)
Subject: Raise HTTPStatusError in raise_from_status (#1072)
X-Git-Tag: 0.14.0~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27b0dbc22da1424a020c2bb769c81490f39ce283;p=thirdparty%2Fhttpx.git

Raise HTTPStatusError in raise_from_status (#1072)
---

diff --git a/docs/quickstart.md b/docs/quickstart.md
index 67915780..f1942155 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -267,9 +267,10 @@ We can raise an exception for any Client or Server error responses (4xx or 5xx s
 404
 >>> not_found.raise_for_status()
 Traceback (most recent call last):
-  File "/Users/tomchristie/GitHub/encode/httpcore/httpx/models.py", line 776, in raise_for_status
-    raise HTTPError(message)
-httpx.HTTPError: 404 Not Found
+  File "/Users/tomchristie/GitHub/encode/httpcore/httpx/models.py", line 837, in raise_for_status
+    raise HTTPStatusError(message, response=self)
+httpx._exceptions.HTTPStatusError: 404 Client Error: Not Found for url: https://httpbin.org/status/404
+For more information check: https://httpstatuses.com/404
 ```
 
 Any successful response codes will simply return `None` rather than raising an exception.
diff --git a/httpx/__init__.py b/httpx/__init__.py
index a45dd549..b88c9a84 100644
--- a/httpx/__init__.py
+++ b/httpx/__init__.py
@@ -10,6 +10,7 @@ from ._exceptions import (
     CookieConflict,
     DecodingError,
     HTTPError,
+    HTTPStatusError,
     InvalidURL,
     NetworkError,
     NotRedirectResponse,
@@ -66,6 +67,7 @@ __all__ = [
     "CookieConflict",
     "DecodingError",
     "HTTPError",
+    "HTTPStatusError",
     "InvalidURL",
     "NetworkError",
     "NotRedirectResponse",
diff --git a/httpx/_exceptions.py b/httpx/_exceptions.py
index ae07ec56..f36fafb6 100644
--- a/httpx/_exceptions.py
+++ b/httpx/_exceptions.py
@@ -121,6 +121,17 @@ class DecodingError(HTTPError):
     """
 
 
+class HTTPStatusError(HTTPError):
+    """
+    Response sent an error HTTP status.
+    """
+
+    def __init__(self, *args: typing.Any, response: "Response") -> None:
+        super().__init__(*args)
+        self._request = response.request
+        self.response = response
+
+
 # Redirect exceptions...
 
 
diff --git a/httpx/_models.py b/httpx/_models.py
index 1ab162cd..892a959d 100644
--- a/httpx/_models.py
+++ b/httpx/_models.py
@@ -23,7 +23,7 @@ from ._decoders import (
 )
 from ._exceptions import (
     CookieConflict,
-    HTTPError,
+    HTTPStatusError,
     InvalidURL,
     NotRedirectResponse,
     RequestNotRead,
@@ -825,7 +825,7 @@ class Response:
 
     def raise_for_status(self) -> None:
         """
-        Raise the `HTTPError` if one occurred.
+        Raise the `HTTPStatusError` if one occurred.
         """
         message = (
             "{0.status_code} {error_type}: {0.reason_phrase} for url: {0.url}\n"
@@ -834,10 +834,10 @@ class Response:
 
         if StatusCode.is_client_error(self.status_code):
             message = message.format(self, error_type="Client Error")
-            raise HTTPError(message, response=self)
+            raise HTTPStatusError(message, response=self)
         elif StatusCode.is_server_error(self.status_code):
             message = message.format(self, error_type="Server Error")
-            raise HTTPError(message, response=self)
+            raise HTTPStatusError(message, response=self)
 
     def json(self, **kwargs: typing.Any) -> typing.Any:
         if self.charset_encoding is None and self.content and len(self.content) > 3:
diff --git a/tests/client/test_async_client.py b/tests/client/test_async_client.py
index 7cb537a0..aabee250 100644
--- a/tests/client/test_async_client.py
+++ b/tests/client/test_async_client.py
@@ -98,7 +98,7 @@ async def test_raise_for_status(server):
             )
 
             if 400 <= status_code < 600:
-                with pytest.raises(httpx.HTTPError) as exc_info:
+                with pytest.raises(httpx.HTTPStatusError) as exc_info:
                     response.raise_for_status()
                 assert exc_info.value.response == response
             else:
diff --git a/tests/client/test_client.py b/tests/client/test_client.py
index 6157aa53..40a59047 100644
--- a/tests/client/test_client.py
+++ b/tests/client/test_client.py
@@ -106,7 +106,7 @@ def test_raise_for_status(server):
                 "GET", server.url.copy_with(path=f"/status/{status_code}")
             )
             if 400 <= status_code < 600:
-                with pytest.raises(httpx.HTTPError) as exc_info:
+                with pytest.raises(httpx.HTTPStatusError) as exc_info:
                     response.raise_for_status()
                 assert exc_info.value.response == response
                 assert exc_info.value.request.url.path == f"/status/{status_code}"