Add setup.cfg support for long_description_content_type (in line with docs).

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:

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)

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'