[Python-checkins] distutils2: normalized some metadata fields

[tarek.ziade]

tarek.ziade pushed 07c81cdef27f to distutils2:

http://hg.python.org/distutils2/rev/07c81cdef27f
changeset:   78:07c81cdef27f
user:        Nicolas Cadou <ncadou at cadou.ca>
date:        Mon Mar 15 21:53:37 2010 -0400
summary:     normalized some metadata fields
files:       src/distutils2/metadata.py, src/distutils2/tests/test_check.py, src/distutils2/tests/test_dist.py

diff --git a/src/distutils2/metadata.py b/src/distutils2/metadata.py
--- a/src/distutils2/metadata.py
+++ b/src/distutils2/metadata.py
@@ -73,8 +73,8 @@
                'Keywords', 'Home-page', 'Author', 'Author-email',
                'Maintainer', 'Maintainer-email', 'License',
                'Classifier', 'Download-URL', 'Obsoletes-Dist',
-               'Provides-Dist', 'Requires-Dist', 'Requires-Python',
-               'Requires-External')
+               'Project-URL', 'Provides-Dist', 'Requires-Dist',
+               'Requires-Python', 'Requires-External')
 
 _345_MARKERS = ('Provides-Dist', 'Requires-Dist', 'Requires-Python',
         'Obsoletes-Dist', 'Requires-External', 'Maintainer',
@@ -124,10 +124,10 @@
         'version': 'Version',
         'platform': 'Platform',
         'supported_platform': 'Supported-Platform',
-        'description': 'Summary',
-        'long_description': 'Description',
+        'summary': 'Summary',
+        'description': 'Description',
         'keywords': 'Keywords',
-        'url': 'Home-page',
+        'home_page': 'Home-page',
         'author': 'Author',
         'author_email': 'Author-email',
         'maintainer': 'Maintainer',
@@ -143,6 +143,7 @@
         'requires': 'Requires',
         'provides': 'Provides',
         'obsoletes': 'Obsoletes',
+        'project_url': 'Project-URL',
         }
 
 _PREDICATE_FIELDS = ('Requires-Dist', 'Obsoletes-Dist', 'Provides-Dist')
diff --git a/src/distutils2/tests/test_check.py b/src/distutils2/tests/test_check.py
--- a/src/distutils2/tests/test_check.py
+++ b/src/distutils2/tests/test_check.py
@@ -32,7 +32,7 @@
         # now let's add the required fields
         # and run it again, to make sure we don't get
         # any warning anymore
-        metadata = {'url': 'xxx', 'author': 'xxx',
+        metadata = {'home_page': 'xxx', 'author': 'xxx',
                     'author_email': 'xxx',
                     'name': 'xxx', 'version': 'xxx'
                     }
diff --git a/src/distutils2/tests/test_dist.py b/src/distutils2/tests/test_dist.py
--- a/src/distutils2/tests/test_dist.py
+++ b/src/distutils2/tests/test_dist.py
@@ -134,8 +134,8 @@
         dist = klass(attrs={'author': u'Mister Café',
                             'name': 'my.package',
                             'maintainer': u'Café Junior',
-                            'description': u'Café torréfié',
-                            'long_description': u'Héhéhé'})
+                            'summary': u'Café torréfié',
+                            'description': u'Héhéhé'})
 
 
         # let's make sure the file can be written
@@ -147,8 +147,8 @@
         dist = klass(attrs={'author': 'Mister Cafe',
                             'name': 'my.package',
                             'maintainer': 'Cafe Junior',
-                            'description': 'Cafe torrefie',
-                            'long_description': 'Hehehe'})
+                            'summary': 'Cafe torrefie',
+                            'description': 'Hehehe'})
 
         my_file2 = os.path.join(tmp_dir, 'f2')
         dist.metadata.write_file(open(my_file, 'w'))
@@ -379,26 +379,26 @@
                   if line.strip() != '']
         self.assertTrue(len(output) > 0)
 
-    def test_long_description(self):
-        long_desc = textwrap.dedent("""\
+    def test_description(self):
+        desc = textwrap.dedent("""\
         example::
               We start here
             and continue here
           and end here.""")
         attrs = {"name": "package",
                  "version": "1.0",
-                 "long_description": long_desc}
+                 "description": desc}
 
         dist = distutils2.dist.Distribution(attrs)
         meta = self.format_metadata(dist)
         meta = meta.replace('\n' + 7 * ' ' + '|', '\n')
-        self.assertTrue(long_desc in meta)
+        self.assertTrue(desc in meta)
 
     def test_read_metadata(self):
         attrs = {"name": "package",
                  "version": "1.0",
-                 "long_description": "desc",
-                 "description": "xxx",
+                 "description": "desc",
+                 "summary": "xxx",
                  "download_url": "http://example.com",
                  "keywords": ['one', 'two'],
                  "requires_dist": ['foo']}
@@ -414,7 +414,7 @@
         metadata.read_file(PKG_INFO)
         self.assertEquals(metadata['name'], "package")
         self.assertEquals(metadata['version'], "1.0")
-        self.assertEquals(metadata['description'], "xxx")
+        self.assertEquals(metadata['summary'], "xxx")
         self.assertEquals(metadata['download_url'], 'http://example.com')
         self.assertEquals(metadata['keywords'], ['one', 'two'])
         self.assertEquals(metadata['platform'], [])

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