[Python-checkins] cpython (2.7): Fix determination of Metadata version (#8933). Patch by Filip Gruszczyński.
eric.araujo
python-checkins at python.org
Mon Sep 12 17:49:40 CEST 2011
http://hg.python.org/cpython/rev/4b72d56cf42f
changeset: 72362:4b72d56cf42f
branch: 2.7
user: Éric Araujo <merwok at netwok.org>
date: Sat Sep 10 05:39:45 2011 +0200
summary:
Fix determination of Metadata version (#8933). Patch by Filip Gruszczyński.
files:
Lib/distutils/dist.py | 3 ++-
Lib/distutils/tests/test_dist.py | 14 ++++++++++++++
Misc/NEWS | 6 +++++-
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -1111,7 +1111,8 @@
"""Write the PKG-INFO format data to a file object.
"""
version = '1.0'
- if self.provides or self.requires or self.obsoletes:
+ if (self.provides or self.requires or self.obsoletes or
+ self.classifiers or self.download_url):
version = '1.1'
self._write_field(file, 'Metadata-Version', version)
diff --git a/Lib/distutils/tests/test_dist.py b/Lib/distutils/tests/test_dist.py
--- a/Lib/distutils/tests/test_dist.py
+++ b/Lib/distutils/tests/test_dist.py
@@ -245,6 +245,20 @@
sys.argv[:] = self.argv[1]
super(MetadataTestCase, self).tearDown()
+ def test_classifier(self):
+ attrs = {'name': 'Boa', 'version': '3.0',
+ 'classifiers': ['Programming Language :: Python :: 3']}
+ dist = Distribution(attrs)
+ meta = self.format_metadata(dist)
+ self.assertIn('Metadata-Version: 1.1', meta)
+
+ def test_download_url(self):
+ attrs = {'name': 'Boa', 'version': '3.0',
+ 'download_url': 'http://example.org/boa'}
+ dist = Distribution(attrs)
+ meta = self.format_metadata(dist)
+ self.assertIn('Metadata-Version: 1.1', meta)
+
def test_long_description(self):
long_desc = textwrap.dedent("""\
example::
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -39,7 +39,11 @@
Library
-------
-
+
+- Issue #8933: distutils' PKG-INFO files will now correctly report
+ Metadata-Version: 1.1 instead of 1.0 if a Classifier or Download-URL field is
+ present.
+
- Issue #8286: The distutils command sdist will print a warning message instead
of crashing when an invalid path is given in the manifest template.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list