Reformat HTTP errors

tests/conftest.py

@@ -128,7 +128,7 @@ def entered_password(monkeypatch):
     monkeypatch.setattr(getpass, "getpass", lambda prompt: "entered pw")
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def sampleproject_dist(tmp_path_factory):
     checkout = tmp_path_factory.mktemp("sampleproject", numbered=False)
     subprocess.run(

tests/test_integration.py

@@ -1,7 +1,9 @@
 import sys
 
+import colorama
 import pytest
 
+from twine import __main__ as dunder_main
 from twine import cli
 
 
@@ -46,6 +48,29 @@ def test_pypi_upload(sampleproject_dist):
     cli.dispatch(command)
 
 
+def test_pypi_error(sampleproject_dist, monkeypatch):
+    command = [
+        "twine",
+        "upload",
+        "--repository-url",
+        "https://test.pypi.org/legacy/",
+        "--username",
+        "foo",
+        "--password",
+        "bar",
+        str(sampleproject_dist),
+    ]
+    monkeypatch.setattr(sys, "argv", command)
+
+    message = (
+        "HTTPError from https://test.pypi.org/legacy/: 403 Client Error\n"
+        "Invalid or non-existent authentication information. "
+        "See https://test.pypi.org/help/#invalid-auth for details"
+    )
+
+    assert dunder_main.main() == colorama.Fore.RED + message + colorama.Style.RESET_ALL
+
+
 @pytest.mark.xfail(
     sys.platform == "win32",
     reason="pytest-services watcher_getter fixture does not support Windows",

twine/__main__.py

@@ -12,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+import re
 import sys
 from typing import Any
 
@@ -25,8 +26,27 @@
 def main() -> Any:
     try:
         return cli.dispatch(sys.argv[1:])
-    except (exceptions.TwineException, requests.HTTPError) as exc:
-        return _format_error(f"{exc.__class__.__name__}: {exc.args[0]}")
+    except requests.HTTPError as exc:
+        return _format_error(_format_http_exception(exc))
+    except exceptions.TwineException as exc:
+        return _format_error(_format_exception(exc))
+
+
+def _format_http_exception(exc: requests.HTTPError) -> str:
+    # '%s Client Error: %s for url: %s'
+    # '%s Server Error: %s for url: %s'
+    pattern = r"(?P<status>.*Error): (?P<reason>.*) for url: (?P<url>.*)"
+    match = re.match(pattern, exc.args[0])
+    if match:
+        return (
+            f"{exc.__class__.__name__} from {match['url']}: {match['status']}\n"
+            f"{match['reason']}"
+        )
+    return _format_exception(exc)
+
+
+def _format_exception(exc: Exception) -> str:
+    return f"{exc.__class__.__name__}: {exc.args[0]}"
 
 
 def _format_error(message: str) -> str: