Skip to content

Commit 8b8cb58

Browse files
authored
Update XMLRPC error message, to reference status.python.org (#8938)
* Update views.py * Update test_xmlrpc.py * Update test_xmlrpc.py * Update views.py
1 parent 851e4c3 commit 8b8cb58

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

tests/unit/legacy/api/xmlrpc/test_xmlrpc.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ def test_error_when_disabled(self, pyramid_request, metrics, monkeypatch):
124124
xmlrpc.search(pyramid_request, {"name": "foo", "summary": ["one", "two"]})
125125

126126
assert exc.value.faultString == (
127-
"RuntimeError: This API has been temporarily disabled due to unmanageable "
128-
"load and will be deprecated in the near future. Please use the Simple or "
129-
"JSON API instead."
127+
"RuntimeError: PyPI's XMLRPC API has been temporarily disabled due to "
128+
"unmanageable load and will be deprecated in the near future. See "
129+
"https://status.python.org/ for more information."
130130
)
131131
assert metrics.increment.calls == [
132132
pretend.call("warehouse.xmlrpc.search.deprecated")

warehouse/legacy/api/xmlrpc/views.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,10 @@ def search(request, spec: Mapping[str, Union[str, List[str]]], operator: str = "
238238
raise XMLRPCWrappedError(
239239
RuntimeError(
240240
(
241-
"This API has been temporarily disabled due to unmanageable load "
242-
"and will be deprecated in the near future. Please use the Simple "
243-
"or JSON API instead."
241+
"PyPI's XMLRPC API has been temporarily disabled due to "
242+
"unmanageable load and will be deprecated in the near "
243+
"future. See https://status.python.org/ for more "
244+
"information."
244245
)
245246
)
246247
)

0 commit comments

Comments
 (0)