diff --git a/tests/unit/forklift/test_legacy.py b/tests/unit/forklift/test_legacy.py index a567f0161f8b..dc7e54edade4 100644 --- a/tests/unit/forklift/test_legacy.py +++ b/tests/unit/forklift/test_legacy.py @@ -919,6 +919,7 @@ def test_fails_with_invalid_names(self, pyramid_config, db_request, name): "for more information." ).format(name) + @pytest.mark.xfail(reason="https://github.com/pypa/warehouse/issues/4079") @pytest.mark.parametrize( ("description_content_type", "description", "message"), [ diff --git a/warehouse/forklift/legacy.py b/warehouse/forklift/legacy.py index 89868cce565e..93261fdb153f 100644 --- a/warehouse/forklift/legacy.py +++ b/warehouse/forklift/legacy.py @@ -52,7 +52,7 @@ JournalEntry, BlacklistedProject, ) -from warehouse.utils import http, readme +from warehouse.utils import http MAX_FILESIZE = 60 * 1024 * 1024 # 60M @@ -892,31 +892,34 @@ def file_upload(request): ) # Uploading should prevent broken rendered descriptions. - if form.description.data: - description_content_type = form.description_content_type.data - if not description_content_type: - description_content_type = "text/x-rst" - rendered = readme.render( - form.description.data, description_content_type, use_fallback=False - ) - if rendered is None: - if form.description_content_type.data: - message = ( - "The description failed to render " - "for '{description_content_type}'." - ).format(description_content_type=description_content_type) - else: - message = ( - "The description failed to render " - "in the default format of reStructuredText." - ) - raise _exc_with_message( - HTTPBadRequest, - "{message} See {projecthelp} for more information.".format( - message=message, - projecthelp=request.help_url(_anchor="description-content-type"), - ), - ) from None + # Temporarily disabled, see + # https://github.com/pypa/warehouse/issues/4079 + # if form.description.data: + # description_content_type = form.description_content_type.data + # if not description_content_type: + # description_content_type = "text/x-rst" + # rendered = readme.render( + # form.description.data, description_content_type, use_fallback=False + # ) + + # if rendered is None: + # if form.description_content_type.data: + # message = ( + # "The description failed to render " + # "for '{description_content_type}'." + # ).format(description_content_type=description_content_type) + # else: + # message = ( + # "The description failed to render " + # "in the default format of reStructuredText." + # ) + # raise _exc_with_message( + # HTTPBadRequest, + # "{message} See {projecthelp} for more information.".format( + # message=message, + # projecthelp=request.help_url(_anchor="description-content-type"), + # ), + # ) from None try: canonical_version = packaging.utils.canonicalize_version(form.version.data)