From 5785e89a468df4637f4a7590c64baef74856aaea Mon Sep 17 00:00:00 2001 From: Pradyun Gedam <3275593+pradyunsg@users.noreply.github.com> Date: Fri, 18 Dec 2020 18:06:00 +0000 Subject: [PATCH 1/4] Update views.py --- warehouse/legacy/api/xmlrpc/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/warehouse/legacy/api/xmlrpc/views.py b/warehouse/legacy/api/xmlrpc/views.py index 0c6e549e335b..5ffb5d9b842a 100644 --- a/warehouse/legacy/api/xmlrpc/views.py +++ b/warehouse/legacy/api/xmlrpc/views.py @@ -238,9 +238,9 @@ 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." ) ) ) From 45c70c258df6840f56b5a7cc5af2dc1fa09f1ef2 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam <3275593+pradyunsg@users.noreply.github.com> Date: Fri, 18 Dec 2020 18:08:03 +0000 Subject: [PATCH 2/4] Update test_xmlrpc.py --- tests/unit/legacy/api/xmlrpc/test_xmlrpc.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/legacy/api/xmlrpc/test_xmlrpc.py b/tests/unit/legacy/api/xmlrpc/test_xmlrpc.py index 714460cc3288..79653b05098a 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/incidents/ for more information." ) assert metrics.increment.calls == [ pretend.call("warehouse.xmlrpc.search.deprecated") From 82d8a4d8eed581c3ae7999519b0704a5ba51ac6c Mon Sep 17 00:00:00 2001 From: Pradyun Gedam <3275593+pradyunsg@users.noreply.github.com> Date: Fri, 18 Dec 2020 18:10:10 +0000 Subject: [PATCH 3/4] Update test_xmlrpc.py --- tests/unit/legacy/api/xmlrpc/test_xmlrpc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/legacy/api/xmlrpc/test_xmlrpc.py b/tests/unit/legacy/api/xmlrpc/test_xmlrpc.py index 79653b05098a..30482a6b9cec 100644 --- a/tests/unit/legacy/api/xmlrpc/test_xmlrpc.py +++ b/tests/unit/legacy/api/xmlrpc/test_xmlrpc.py @@ -126,7 +126,7 @@ def test_error_when_disabled(self, pyramid_request, metrics, monkeypatch): assert exc.value.faultString == ( "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/incidents/ for more information." + "https://status.python.org/ for more information." ) assert metrics.increment.calls == [ pretend.call("warehouse.xmlrpc.search.deprecated") From f92ad3c0092a79170a6d41bca8c6787c23fd7a86 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam <3275593+pradyunsg@users.noreply.github.com> Date: Fri, 18 Dec 2020 18:25:10 +0000 Subject: [PATCH 4/4] Update views.py --- warehouse/legacy/api/xmlrpc/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/warehouse/legacy/api/xmlrpc/views.py b/warehouse/legacy/api/xmlrpc/views.py index 5ffb5d9b842a..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( ( - "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." + "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." ) ) )