diff options
| -rwxr-xr-x | setuptools/command/egg_info.py | 2 | ||||
| -rw-r--r-- | setuptools/dist.py | 7 | ||||
| -rw-r--r-- | setuptools/tests/test_config.py | 2 |
3 files changed, 10 insertions, 1 deletions
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: diff --git a/setuptools/dist.py b/setuptools/dist.py index aa304500..48c7a456 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -332,6 +332,13 @@ class Distribution(Distribution_parse_config_files, _Distribution): for ep in pkg_resources.iter_entry_points('distutils.setup_keywords'): vars(self).setdefault(ep.name, None) _Distribution.__init__(self, attrs) + + try: + self.metadata.long_description_content_type + except AttributeError: + self.metadata.long_description_content_type = \ + self.long_description_content_type + if isinstance(self.metadata.version, numbers.Number): # Some people apparently take "version number" too literally :) self.metadata.version = str(self.metadata.version) diff --git a/setuptools/tests/test_config.py b/setuptools/tests/test_config.py index cdfa5af4..15b0cee1 100644 --- a/setuptools/tests/test_config.py +++ b/setuptools/tests/test_config.py @@ -110,6 +110,7 @@ class TestMetadata: '[metadata]\n' 'version = 10.1.1\n' 'description = Some description\n' + 'long_description_content_type = text/something\n' 'long_description = file: README\n' 'name = fake_name\n' 'keywords = one, two\n' @@ -131,6 +132,7 @@ class TestMetadata: assert metadata.version == '10.1.1' assert metadata.description == 'Some description' + assert metadata.long_description_content_type == 'text/something' assert metadata.long_description == 'readme contents\nline2' assert metadata.provides == ['package', 'package.sub'] assert metadata.license == 'BSD 3-Clause License' |