[Python-checkins] distutils2: replaced instances of 'classifiers' with 'classifier'

[tarek.ziade]

tarek.ziade pushed e2b91af34f58 to distutils2:

http://hg.python.org/distutils2/rev/e2b91af34f58
changeset:   77:e2b91af34f58
user:        Nicolas Cadou <ncadou at cadou.ca>
date:        Mon Mar 15 21:10:46 2010 -0400
summary:     replaced instances of 'classifiers' with 'classifier'
files:       src/distutils2/command/register.py, src/distutils2/dist.py, src/distutils2/mkpkg.py

diff --git a/src/distutils2/command/register.py b/src/distutils2/command/register.py
--- a/src/distutils2/command/register.py
+++ b/src/distutils2/command/register.py
@@ -239,7 +239,7 @@
             'description': meta['Description'],
             'keywords': meta['Keywords'],
             'platform': meta['Platform'],
-            'classifiers': meta['Classifier'],
+            'classifier': meta['Classifier'],
             'download_url': meta['Download-URL'],
             #'provides': meta['Provides'],
             #'requires': meta['Requires'],
diff --git a/src/distutils2/dist.py b/src/distutils2/dist.py
--- a/src/distutils2/dist.py
+++ b/src/distutils2/dist.py
@@ -101,7 +101,7 @@
          "print the long package description"),
         ('platforms', None,
          "print the list of platforms"),
-        ('classifiers', None,
+        ('classifier', None,
          "print the list of classifiers"),
         ('keywords', None,
          "print the list of keywords"),
@@ -672,7 +672,7 @@
                 value = self.metadata[opt]
                 if opt in ['keywords', 'platform']:
                     print(','.join(value))
-                elif opt in ('classifiers', 'provides', 'requires',
+                elif opt in ('classifier', 'provides', 'requires',
                              'obsoletes'):
                     print('\n'.join(value))
                 else:
diff --git a/src/distutils2/mkpkg.py b/src/distutils2/mkpkg.py
--- a/src/distutils2/mkpkg.py
+++ b/src/distutils2/mkpkg.py
@@ -678,7 +678,7 @@
 		self.config = None
 		self.classifierDict = {}
 		self.setupData = {}
-		self.setupData['classifiers'] = self.classifierDict
+		self.setupData['classifier'] = self.classifierDict
 		self.setupData['packages'] = {}
 
 		self.loadConfigFile()
@@ -878,7 +878,7 @@
 		fp.write('from sys import version\n')
 		fp.write('if version < \'2.2.3\':\n')
 		fp.write('    from distutils2.dist import DistributionMetadata\n')
-		fp.write('    DistributionMetadata.classifiers = None\n')
+		fp.write('    DistributionMetadata.classifier = None\n')
 		fp.write('    DistributionMetadata.download_url = None\n')
 
 		fp.write('setup(name = %s,\n' % repr(self.setupData['name']))
@@ -890,9 +890,9 @@
 				% repr(self.setupData['author_email']))
 		if self.setupData['url']:
 			fp.write('        url = %s,\n' % repr(self.setupData['url']))
-		if self.setupData['classifiers']:
-			fp.write('        classifiers = [\n')
-			for classifier in sorted(self.setupData['classifiers'].keys()):
+		if self.setupData['classifier']:
+			fp.write('        classifier = [\n')
+			for classifier in sorted(self.setupData['classifier'].keys()):
 				fp.write('              %s,\n' % repr(classifier))
 			fp.write('           ],\n')
 		if self.setupData['packages']:

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