[Python-checkins] distutils2: Fix determination of Metadata version in packaging (#8933).

[eric.araujo]

http://hg.python.org/distutils2/rev/b9ca25b3254e
changeset:   1175:b9ca25b3254e
user:        Éric Araujo <merwok at netwok.org>
date:        Mon Sep 19 04:47:20 2011 +0200
summary:
  Fix determination of Metadata version in packaging (#8933).

Original patch by Filip Gruszczyński.

files:
  distutils2/metadata.py            |  8 +++++---
  distutils2/tests/test_metadata.py |  4 ++--
  2 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/distutils2/metadata.py b/distutils2/metadata.py
--- a/distutils2/metadata.py
+++ b/distutils2/metadata.py
@@ -62,7 +62,8 @@
                'License', 'Classifier', 'Download-URL', 'Obsoletes',
                'Provides', 'Requires')
 
-_314_MARKERS = ('Obsoletes', 'Provides', 'Requires')
+_314_MARKERS = ('Obsoletes', 'Provides', 'Requires', 'Classifier',
+                'Download-URL')
 
 _345_FIELDS = ('Metadata-Version', 'Name', 'Version', 'Platform',
                'Supported-Platform', 'Summary', 'Description',
@@ -558,6 +559,7 @@
         return data
 
     # Mapping API
+    # TODO could add iter* variants
 
     def keys(self):
         return list(_version2fieldlist(self['Metadata-Version']))
@@ -567,7 +569,7 @@
             yield key
 
     def values(self):
-        return [self[key] for key in list(self.keys())]
+        return [self[key] for key in self.keys()]
 
     def items(self):
-        return [(key, self[key]) for key in list(self.keys())]
+        return [(key, self[key]) for key in self.keys()]
diff --git a/distutils2/tests/test_metadata.py b/distutils2/tests/test_metadata.py
--- a/distutils2/tests/test_metadata.py
+++ b/distutils2/tests/test_metadata.py
@@ -267,11 +267,11 @@
         self.assertNotIn('Obsoletes', metadata)
 
         metadata['Classifier'] = ['ok']
-        self.assertEqual(metadata['Metadata-Version'], '1.2')
+        self.assertEqual(metadata['Metadata-Version'], '1.1')
 
         metadata = Metadata()
         metadata['Download-URL'] = 'ok'
-        self.assertEqual(metadata['Metadata-Version'], '1.2')
+        self.assertEqual(metadata['Metadata-Version'], '1.1')
 
         metadata = Metadata()
         metadata['Obsoletes'] = 'ok'

-- 
Repository URL: http://hg.python.org/distutils2