From fb639295ac48ba22d89a12f0368c1877f3035bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Araujo?= <merwok@netwok.org>
Date: Mon, 29 Aug 2011 22:03:46 +0200
Subject: =?UTF-8?q?Print=20all=20fields=20when=20calling=20=E2=80=9Cpysetu?=
 =?UTF-8?q?p=20metadata=E2=80=9D=20without=20options.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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.
---
 Doc/install/pysetup.rst |  2 +-
 Lib/packaging/run.py    | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/Doc/install/pysetup.rst b/Doc/install/pysetup.rst
index b88c8e1..08ba08e 100644
--- a/Doc/install/pysetup.rst
+++ b/Doc/install/pysetup.rst
@@ -76,7 +76,7 @@ argument. ::
    Name:
        virtualenv
 
-   $ pysetup metadata virtualenv --all
+   $ pysetup metadata virtualenv
    Metadata-Version:
        1.0
    Name:
diff --git a/Lib/packaging/run.py b/Lib/packaging/run.py
index 8e117ed..5b33583 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:
-- 
cgit v0.12