Handle non-standard HTTP status codes (#1309)

* Handle non-standard HTTP status codes

Signed-off-by: William Woodruff <william@astral.sh>

* Parametrize HTTP exception test

Signed-off-by: William Woodruff <william@astral.sh>

* Parametrize reason too

Signed-off-by: William Woodruff <william@astral.sh>

---------

Signed-off-by: William Woodruff <william@astral.sh>

Author: woodruffw

tests/test_main.py

@@ -13,6 +13,7 @@
 import sys
 
 import pretend
+import pytest
 import requests
 
 from twine import __main__ as dunder_main
@@ -42,17 +43,21 @@ def test_exception_handling(monkeypatch, capsys):
     )
 
 
-def test_http_exception_handling(monkeypatch, capsys):
+@pytest.mark.parametrize(
+    ("status_code", "status_phrase", "reason"),
+    [(400, "Bad Request", "Error reason"), (599, "Unknown Status", "Another reason")],
+)
+def test_http_exception_handling(
+    monkeypatch, capsys, status_code, status_phrase, reason
+):
     monkeypatch.setattr(sys, "argv", ["twine", "upload", "test.whl"])
     monkeypatch.setattr(
         upload,
         "upload",
         pretend.raiser(
             requests.HTTPError(
                 response=pretend.stub(
-                    url="https://example.org",
-                    status_code=400,
-                    reason="Error reason",
+                    url="https://example.org", status_code=status_code, reason=reason
                 )
             )
         ),
@@ -64,8 +69,8 @@ def test_http_exception_handling(monkeypatch, capsys):
     captured = capsys.readouterr()
 
     assert _unwrap_lines(captured.out) == (
-        f"{RED_ERROR} HTTPError: 400 Bad Request from https://example.org "
-        "Error reason"
+        f"{RED_ERROR} HTTPError: {status_code} {status_phrase} "
+        f"from https://example.org {reason}"
     )
 
 

twine/__main__.py

@@ -37,7 +37,20 @@ def main() -> Any:
 
         error = True
         status_code = response.status_code
-        status_phrase = http.HTTPStatus(status_code).phrase
+
+        try:
+            status_phrase = http.HTTPStatus(status_code).phrase
+        except ValueError:
+            # HTTPStatus will raise ValueError if the server responds with
+            # a non-standard status code. This is almost certainly an upstream
+            # index error since non-standard status codes should only be used
+            # for internal signaling, but there's nothing we can do about that
+            # here other than avoid propagating it as an unhandled exception.
+            #
+            # See: <https://github.com/pypa/twine/issues/1304>
+            # See: <https://github.com/pypi/warehouse/issues/19713>
+            status_phrase = "Unknown Status"
+
         logger.error(
             f"{exc.__class__.__name__}: {status_code} {status_phrase} "
             f"from {response.url}\n"