summaryrefslogtreecommitdiff
path: root/setuptools/command
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2018-01-05 08:07:21 -0500
committerGitHub <noreply@github.com>2018-01-05 08:07:21 -0500
commit647ef56421e07e8322f27a77f49ac8c7ddbc1043 (patch)
tree810d77d3855f9fe9a4a4d854615576af624fd200 /setuptools/command
parent8fe36a5710beb556a06d05f284e5ea49b4656624 (diff)
parent4ae5bc9e6fd52517fe31048b6570224fb9cbb70d (diff)
downloadpython-setuptools-git-647ef56421e07e8322f27a77f49ac8c7ddbc1043.tar.gz
Merge branch 'master' into master
Diffstat (limited to 'setuptools/command')
-rwxr-xr-xsetuptools/command/egg_info.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 103c5f20..befa0904 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,
- 'long_description_content_type'
- )
+
try:
# write unescaped data to PKG-INFO, so older pkg_resources
# can still parse it