Skip to content

Commit 48ca019

Browse files
authored
fix: skip content_type detection when blank string (#14084)
1 parent efa6de6 commit 48ca019

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

tests/unit/utils/test_readme.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,10 @@ def test_can_render_missing_content_type():
4343
assert result == "<p>raw thing</p>\n"
4444

4545

46+
def test_can_render_blank_content_type():
47+
result = readme.render("wild thing", "")
48+
assert result == "<p>wild thing</p>\n"
49+
50+
4651
def test_renderer_version():
4752
assert readme.renderer_version() is not None

warehouse/utils/readme.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"""Utils for rendering and updating package descriptions (READMEs)."""
1414

1515
from email.message import EmailMessage
16+
from importlib.metadata import distribution
1617

17-
import pkg_resources
1818
import readme_renderer.markdown
1919
import readme_renderer.rst
2020
import readme_renderer.txt
@@ -32,9 +32,9 @@ def render(value, content_type=None, use_fallback=True):
3232
if value is None:
3333
return value
3434

35-
# Necessary because `msg.get_content_type()` returns `test/plain` for
35+
# Necessary because `msg.get_content_type()` returns `text/plain` for
3636
# invalid or missing input, per RFC 2045, which changes our behavior.
37-
if content_type is not None:
37+
if content_type:
3838
msg = EmailMessage()
3939
msg["content-type"] = content_type
4040
content_type = msg.get_content_type()
@@ -61,4 +61,4 @@ def render(value, content_type=None, use_fallback=True):
6161

6262

6363
def renderer_version():
64-
return pkg_resources.get_distribution("readme-renderer").version
64+
return distribution("readme-renderer").version

0 commit comments

Comments
 (0)