1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Print all fields when calling “pysetup metadata” without options.

Browse Source 
When called without option (“-f field” or “--all”), “pysetup metadata”
didn’t do anything useful.  Now it prints out all metadata fields.  The
“--all” option is removed.
This commit is contained in:
Éric Araujo 2011-08-29 22:03:46 +02:00
parent b741313ca8
commit fb639295ac
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/install/pysetup.rst
View File

@ -76,7 +76,7 @@ argument. ::
Name: Name:
virtualenv virtualenv
$ pysetup metadata virtualenv --all $ pysetup metadata virtualenv
Metadata-Version: Metadata-Version:
1.0 1.0
Name: Name:

14
Lib/packaging/run.py
View File

@ -71,8 +71,8 @@ positional arguments:
""" """
metadata_usage = """\ metadata_usage = """\
Usage: pysetup metadata [dist] [-f field ...] Usage: pysetup metadata [dist]
or: pysetup metadata [dist] [--all] or: pysetup metadata [dist] [-f field ...]
or: pysetup metadata --help or: pysetup metadata --help
Print metadata for the distribution. Print metadata for the distribution.
@ -81,8 +81,7 @@ positional arguments:
dist installed distribution name dist installed distribution name
optional arguments: optional arguments:
-f metadata field to print -f metadata field to print; omit to get all fields
--all print all metadata fields
""" """
remove_usage = """\ remove_usage = """\
@ -252,7 +251,7 @@ def _install(dispatcher, args, **kw):
@action_help(metadata_usage) @action_help(metadata_usage)
def _metadata(dispatcher, args, **kw): def _metadata(dispatcher, args, **kw):
opts = _parse_args(args[1:], 'f:', ['all']) opts = _parse_args(args[1:], 'f:', [])
if opts['args']: if opts['args']:
name = opts['args'][0] name = opts['args'][0]
dist = get_distribution(name, use_egg_info=True) dist = get_distribution(name, use_egg_info=True)
@ -269,13 +268,10 @@ def _metadata(dispatcher, args, **kw):
metadata = dist.metadata metadata = dist.metadata
if 'all' in opts:
keys = metadata.keys()
else:
if 'f' in opts: if 'f' in opts:
keys = (k for k in opts['f'] if k in metadata) keys = (k for k in opts['f'] if k in metadata)
else: else:
keys = () keys = metadata.keys()
for key in keys: for key in keys:
if key in metadata: if key in metadata: