Skip to content

Commit 559b6eb

Browse files
theacodesewdurbin
authored andcommitted
Revert erroring when readme content does not render (#4099)
* Revert erroring when readme content does not render * Lint * Lint, again
1 parent 82a9cd3 commit 559b6eb

File tree

2 files changed

+30
-26
lines changed

2 files changed

+30
-26
lines changed

tests/unit/forklift/test_legacy.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -919,6 +919,7 @@ def test_fails_with_invalid_names(self, pyramid_config, db_request, name):
919919
"for more information."
920920
).format(name)
921921

922+
@pytest.mark.xfail(reason="https://github.com/pypa/warehouse/issues/4079")
922923
@pytest.mark.parametrize(
923924
("description_content_type", "description", "message"),
924925
[

warehouse/forklift/legacy.py

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
JournalEntry,
5353
BlacklistedProject,
5454
)
55-
from warehouse.utils import http, readme
55+
from warehouse.utils import http
5656

5757

5858
MAX_FILESIZE = 60 * 1024 * 1024 # 60M
@@ -892,31 +892,34 @@ def file_upload(request):
892892
)
893893

894894
# Uploading should prevent broken rendered descriptions.
895-
if form.description.data:
896-
description_content_type = form.description_content_type.data
897-
if not description_content_type:
898-
description_content_type = "text/x-rst"
899-
rendered = readme.render(
900-
form.description.data, description_content_type, use_fallback=False
901-
)
902-
if rendered is None:
903-
if form.description_content_type.data:
904-
message = (
905-
"The description failed to render "
906-
"for '{description_content_type}'."
907-
).format(description_content_type=description_content_type)
908-
else:
909-
message = (
910-
"The description failed to render "
911-
"in the default format of reStructuredText."
912-
)
913-
raise _exc_with_message(
914-
HTTPBadRequest,
915-
"{message} See {projecthelp} for more information.".format(
916-
message=message,
917-
projecthelp=request.help_url(_anchor="description-content-type"),
918-
),
919-
) from None
895+
# Temporarily disabled, see
896+
# https://github.com/pypa/warehouse/issues/4079
897+
# if form.description.data:
898+
# description_content_type = form.description_content_type.data
899+
# if not description_content_type:
900+
# description_content_type = "text/x-rst"
901+
# rendered = readme.render(
902+
# form.description.data, description_content_type, use_fallback=False
903+
# )
904+
905+
# if rendered is None:
906+
# if form.description_content_type.data:
907+
# message = (
908+
# "The description failed to render "
909+
# "for '{description_content_type}'."
910+
# ).format(description_content_type=description_content_type)
911+
# else:
912+
# message = (
913+
# "The description failed to render "
914+
# "in the default format of reStructuredText."
915+
# )
916+
# raise _exc_with_message(
917+
# HTTPBadRequest,
918+
# "{message} See {projecthelp} for more information.".format(
919+
# message=message,
920+
# projecthelp=request.help_url(_anchor="description-content-type"),
921+
# ),
922+
# ) from None
920923

921924
try:
922925
canonical_version = packaging.utils.canonicalize_version(form.version.data)

0 commit comments

Comments
 (0)