Merged revisions 81492 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81492 | steven.bethard | 2010-05-23 20:45:26 -0700 (Sun, 23 May 2010) | 1 line

  Fix default value for version help. Approved by Benjamin on python-dev: http://mail.python.org/pipermail/python-dev/2010-May/100231.html
........

diff --git a/Lib/argparse.py b/Lib/argparse.py
index 9da59e3c03d70e240f0515d05a08a7a312bff34e..c12a16d53fe161fd5c4d64c58040c3ce6d07c100 100644 (file)
--- a/Lib/argparse.py
+++ b/Lib/argparse.py
@@ -987,7 +987,7 @@ class _VersionAction(Action):
                  version=None,
                  dest=SUPPRESS,
                  default=SUPPRESS,
-                 help=None):
+                 help="show program's version number and exit"):
         super(_VersionAction, self).__init__(
             option_strings=option_strings,
             dest=dest,

diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py
index f13c6222679006e541e26784f3481a27245df89d..94cd3d394702f09d6e195f228c8298e3a4af8be4 100644 (file)
--- a/Lib/test/test_argparse.py
+++ b/Lib/test/test_argparse.py
@@ -3688,6 +3688,25 @@ class TestHelpArgumentDefaults(HelpTestCase):
         '''
     version = ''
 
+class TestHelpVersionAction(HelpTestCase):
+    """Test the default help for the version action"""
+
+    parser_signature = Sig(prog='PROG', description='description')
+    argument_signatures = [Sig('-V', '--version', action='version', version='3.6')]
+    argument_group_signatures = []
+    usage = '''\
+        usage: PROG [-h] [-V]
+        '''
+    help = usage + '''\
+
+        description
+
+        optional arguments:
+          -h, --help     show this help message and exit
+          -V, --version  show program's version number and exit
+        '''
+    version = ''
+
 # =====================================
 # Optional/Positional constructor tests
 # =====================================