diff options
| author | Nicolas Cadou <ncadou@cadou.ca> | 2010-03-15 21:10:46 -0400 |
|---|---|---|
| committer | Nicolas Cadou <ncadou@cadou.ca> | 2010-03-15 21:10:46 -0400 |
| commit | 9c3bf8f46ef83500e76204bc652d274489531f03 (patch) | |
| tree | 4e9062a84b9ed7363880552a4b4927412a6a105c | |
| parent | da3ca222b28ae90bba644f29030ead10bd53d228 (diff) | |
| download | disutils2-9c3bf8f46ef83500e76204bc652d274489531f03.tar.gz | |
replaced instances of 'classifiers' with 'classifier'
| -rw-r--r-- | src/distutils2/command/register.py | 2 | ||||
| -rw-r--r-- | src/distutils2/dist.py | 4 | ||||
| -rwxr-xr-x | src/distutils2/mkpkg.py | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/distutils2/command/register.py b/src/distutils2/command/register.py index 4cd878e..c751200 100644 --- a/src/distutils2/command/register.py +++ b/src/distutils2/command/register.py @@ -239,7 +239,7 @@ Your selection [default 1]: ''', log.INFO) '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 index 55737a3..2b3fcad 100644 --- a/src/distutils2/dist.py +++ b/src/distutils2/dist.py @@ -101,7 +101,7 @@ Common commands: (see '--help-commands' for more) "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 @@ Common commands: (see '--help-commands' for more) 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 index 553cd77..350fd6a 100755 --- a/src/distutils2/mkpkg.py +++ b/src/distutils2/mkpkg.py @@ -678,7 +678,7 @@ class SetupClass: 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 @@ Status''', required = False) 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 @@ Status''', required = False) % 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']: |