diff options
| author | Éric Araujo <merwok@netwok.org> | 2011-08-30 16:21:15 +0200 |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2011-08-30 16:21:15 +0200 |
| commit | d15b768ddb68fe82470d26bb2cc36699f4bc0b75 (patch) | |
| tree | 314bac1cdca839976e5de93505d7173add150826 /Lib/packaging/run.py | |
| parent | a514eb95f30306a11a14f8a3b9cbf229c6af6137 (diff) | |
| parent | b9fe54cccc3798f089489ef1e7f9026a35d16d6b (diff) | |
| download | cpython-git-d15b768ddb68fe82470d26bb2cc36699f4bc0b75.tar.gz | |
Branch merge
Diffstat (limited to 'Lib/packaging/run.py')
| -rw-r--r-- | Lib/packaging/run.py | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/Lib/packaging/run.py b/Lib/packaging/run.py index 8e117ed36b..5b335831fa 100644 --- a/Lib/packaging/run.py +++ b/Lib/packaging/run.py @@ -71,8 +71,8 @@ positional arguments: """ metadata_usage = """\ -Usage: pysetup metadata [dist] [-f field ...] - or: pysetup metadata [dist] [--all] +Usage: pysetup metadata [dist] + or: pysetup metadata [dist] [-f field ...] or: pysetup metadata --help Print metadata for the distribution. @@ -81,8 +81,7 @@ positional arguments: dist installed distribution name optional arguments: - -f metadata field to print - --all print all metadata fields + -f metadata field to print; omit to get all fields """ remove_usage = """\ @@ -252,7 +251,7 @@ def _install(dispatcher, args, **kw): @action_help(metadata_usage) def _metadata(dispatcher, args, **kw): - opts = _parse_args(args[1:], 'f:', ['all']) + opts = _parse_args(args[1:], 'f:', []) if opts['args']: name = opts['args'][0] dist = get_distribution(name, use_egg_info=True) @@ -269,13 +268,10 @@ def _metadata(dispatcher, args, **kw): metadata = dist.metadata - if 'all' in opts: - keys = metadata.keys() + if 'f' in opts: + keys = (k for k in opts['f'] if k in metadata) else: - if 'f' in opts: - keys = (k for k in opts['f'] if k in metadata) - else: - keys = () + keys = metadata.keys() for key in keys: if key in metadata: |