diff --git a/tests/unit/legacy/api/xmlrpc/test_xmlrpc.py b/tests/unit/legacy/api/xmlrpc/test_xmlrpc.py index 714460cc3288..30482a6b9cec 100644 --- a/tests/unit/legacy/api/xmlrpc/test_xmlrpc.py +++ b/tests/unit/legacy/api/xmlrpc/test_xmlrpc.py @@ -124,9 +124,9 @@ def test_error_when_disabled(self, pyramid_request, metrics, monkeypatch): xmlrpc.search(pyramid_request, {"name": "foo", "summary": ["one", "two"]}) assert exc.value.faultString == ( - "RuntimeError: This API has been temporarily disabled due to unmanageable " - "load and will be deprecated in the near future. Please use the Simple or " - "JSON API instead." + "RuntimeError: PyPI's XMLRPC API has been temporarily disabled due to " + "unmanageable load and will be deprecated in the near future. See " + "https://status.python.org/ for more information." ) assert metrics.increment.calls == [ pretend.call("warehouse.xmlrpc.search.deprecated") diff --git a/warehouse/legacy/api/xmlrpc/views.py b/warehouse/legacy/api/xmlrpc/views.py index 0c6e549e335b..efae70ae66ad 100644 --- a/warehouse/legacy/api/xmlrpc/views.py +++ b/warehouse/legacy/api/xmlrpc/views.py @@ -238,9 +238,10 @@ def search(request, spec: Mapping[str, Union[str, List[str]]], operator: str = " raise XMLRPCWrappedError( RuntimeError( ( - "This API has been temporarily disabled due to unmanageable load " - "and will be deprecated in the near future. Please use the Simple " - "or JSON API instead." + "PyPI's XMLRPC API has been temporarily disabled due to " + "unmanageable load and will be deprecated in the near " + "future. See https://status.python.org/ for more " + "information." ) ) )