Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix empty str(exception) when initialized with kwargs #2181

Merged
merged 5 commits into from
Jun 20, 2023
Merged

Fix empty str(exception) when initialized with kwargs #2181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7a3a24
Fix empty str(exception) when initialized with kwargs
BoWuGit Jun 11, 2023
e2314dc
Fix empty str(exception) when initialized with kwargs, review change
BoWuGit Jun 18, 2023
ab10bd9
Merge branch 'master' into feature/support-kwargs-initialized-exception
Kludex Jun 20, 2023
5518508
Remove the super().__init__() and refactor tests
Kludex Jun 20, 2023
cfe4729
Remove unused import
Kludex Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions starlette/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ def __init__(
self.detail = detail
self.headers = headers

def __str__(self) -> str:
return f"{self.status_code}: {self.detail}"

def __repr__(self) -> str:
class_name = self.__class__.__name__
return f"{class_name}(status_code={self.status_code!r}, detail={self.detail!r})"
Expand All @@ -28,6 +31,9 @@ def __init__(self, code: int, reason: typing.Optional[str] = None) -> None:
self.code = code
self.reason = reason or ""

def __str__(self) -> str:
return f"{self.code}: {self.reason}"

def __repr__(self) -> str:
class_name = self.__class__.__name__
return f"{class_name}(code={self.code!r}, reason={self.reason!r})"
Expand Down
11 changes: 11 additions & 0 deletions tests/test_exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@ async def app(scope, receive, send):
assert response.text == ""


def test_http_str():
assert str(HTTPException(status_code=404)) == "404: Not Found"
assert str(HTTPException(404, "Not Found: foo")) == "404: Not Found: foo"
assert str(HTTPException(404, headers={"key": "value"})) == "404: Not Found"


def test_http_repr():
assert repr(HTTPException(404)) == (
"HTTPException(status_code=404, detail='Not Found')"
Expand All @@ -160,6 +166,11 @@ class CustomHTTPException(HTTPException):
)


def test_websocket_str():
assert str(WebSocketException(1008)) == "1008: "
assert str(WebSocketException(1008, "Policy Violation")) == "1008: Policy Violation"


def test_websocket_repr():
assert repr(WebSocketException(1008, reason="Policy Violation")) == (
"WebSocketException(code=1008, reason='Policy Violation')"
Expand Down