diff -r 677266d859c4 distutils2/metadata.py --- a/distutils2/metadata.py Wed Mar 09 22:48:05 2011 +0100 +++ b/distutils2/metadata.py Sun Mar 13 00:41:10 2011 +0100 @@ -61,7 +61,8 @@ 'License', 'Classifier', 'Download-URL', 'Obsoletes', 'Provides', 'Requires') -_314_MARKERS = ('Obsoletes', 'Provides', 'Requires') +_314_MARKERS = ('Obsoletes', 'Provides', 'Requires', 'Download-URL', + 'Classifier') _345_FIELDS = ('Metadata-Version', 'Name', 'Version', 'Platform', 'Supported-Platform', 'Summary', 'Description', diff -r 677266d859c4 distutils2/tests/test_dist.py --- a/distutils2/tests/test_dist.py Wed Mar 09 22:48:05 2011 +0100 +++ b/distutils2/tests/test_dist.py Sun Mar 13 00:41:10 2011 +0100 @@ -354,6 +354,20 @@ "version": "1.0", "obsoletes": ["my.pkg (splat)"]}) + def test_download_url(self): + attrs = {"name": "package", "version": "1.0", + "download_url": "url.org"} + dist = Distribution(attrs) + meta = self.format_metadata(dist) + self.assertTrue("Metadata-Version: 1.1" in meta) + + def test_classifier(self): + attrs = {"name": "package", "version": "1.0", + "classifier": ("class1",)} + dist = Distribution(attrs) + meta = self.format_metadata(dist) + self.assertTrue("Metadata-Version: 1.1" in meta) + def format_metadata(self, dist): sio = StringIO.StringIO() dist.metadata.write_file(sio) diff -r 677266d859c4 distutils2/tests/test_metadata.py --- a/distutils2/tests/test_metadata.py Wed Mar 09 22:48:05 2011 +0100 +++ b/distutils2/tests/test_metadata.py Sun Mar 13 00:41:10 2011 +0100 @@ -254,8 +254,8 @@ self.assertEqual(get_metadata_version(metadata), PKG_INFO_PREFERRED_VERSION) metadata['Classifier'] = ['ok'] - self.assertEqual(metadata['Metadata-Version'], '1.2') - self.assertEqual(get_metadata_version(metadata), '1.2') + self.assertEqual(metadata['Metadata-Version'], '1.1') + self.assertEqual(get_metadata_version(metadata), '1.1') def test_project_urls(self): # project-url is a bit specific, make sure we write it