Skip to content

Update XMLRPC error message, to reference status.python.org #8938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 18, 2020
Merged

Update XMLRPC error message, to reference status.python.org #8938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5785e89
Update views.py
pradyunsg Dec 18, 2020
45c70c2
Update test_xmlrpc.py
pradyunsg Dec 18, 2020
82d8a4d
Update test_xmlrpc.py
pradyunsg Dec 18, 2020
f92ad3c
Update views.py
pradyunsg Dec 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/unit/legacy/api/xmlrpc/test_xmlrpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
7 changes: 4 additions & 3 deletions warehouse/legacy/api/xmlrpc/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
)
)
)
Expand Down