From 553e21e12ca2ebe6ab0f597e69594b71271faecc Mon Sep 17 00:00:00 2001 From: Henk-Jaap Wagenaar Date: Tue, 21 Nov 2017 22:16:53 +0000 Subject: Add setup.cfg support for long_description_content_type (in line with docs). --- setuptools/command/egg_info.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setuptools/command/egg_info.py') diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index a1d41b27..27e10eeb 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -598,7 +598,7 @@ def write_pkg_info(cmd, basename, filename): metadata.version, oldver = cmd.egg_version, metadata.version metadata.name, oldname = cmd.egg_name, metadata.name metadata.long_description_content_type = getattr( - cmd.distribution, + cmd.distribution.metadata, 'long_description_content_type' ) try: -- cgit v1.2.3 From 780a6f161ed4ce1026f5279c53c196d3bfdcec37 Mon Sep 17 00:00:00 2001 From: Henk-Jaap Wagenaar Date: Sat, 25 Nov 2017 18:55:58 +0000 Subject: Rework how to handle long_description_content_type --- setuptools/command/egg_info.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'setuptools/command/egg_info.py') diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 27e10eeb..d3725a2f 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -597,10 +597,7 @@ def write_pkg_info(cmd, basename, filename): metadata = cmd.distribution.metadata metadata.version, oldver = cmd.egg_version, metadata.version metadata.name, oldname = cmd.egg_name, metadata.name - metadata.long_description_content_type = getattr( - cmd.distribution.metadata, - 'long_description_content_type' - ) + try: # write unescaped data to PKG-INFO, so older pkg_resources # can still parse it -- cgit v1.2.3