Commit Graph

47 Commits

Author SHA1 Message Date
Barry Warsaw d89774e158 Merge 3.2 fix updates and tests for issue #15906. 2012-09-12 15:31:38 -04:00
Barry Warsaw eaae1b76ae A follow up for issue #15906: change the test for calling the type conversion
on the action's default, reverting it back to previous behavior.  Conversion
is only done on string defaults.

Add a test for this and another test that ensures such type conversions are
only called once.
2012-09-12 14:34:50 -04:00
Barry Warsaw 0ae066b281 - Issue #15906: Fix a regression in argparse caused by the preceding change,
when action='append', type='str' and default=[].
2012-09-12 00:12:29 -04:00
Barry Warsaw 4b2f9e914d - Issue #15906: Fix a regression in argparse caused by the preceding change,
when action='append', type='str' and default=[].
2012-09-11 22:38:47 -04:00
R David Murray 63755f3bd9 merge #15847: allow args to be a tuple in parse_args
This fixes a regression introduced by the fix for issue #13922.  Although args
is not documented as being allowed to be a tuple, previously this worked and
so naturally there are programs in the field that depend on it.

Patch by Zbyszek Jędrzejewski-Szmek.
2012-09-08 12:14:25 -04:00
R David Murray b522828d2a #15847: allow args to be a tuple in parse_args
This fixes a regression introduced by the fix for issue #13922.  Although args
is not documented as being allowed to be a tuple, previously this worked and
so naturally there are programs in the field that depend on it.

Patch by Zbyszek Jędrzejewski-Szmek.
2012-09-08 12:08:01 -04:00
R David Murray 64b0ef1509 Merge #12776,#11839: call argparse type function only once.
Before, the type function was called twice in the case where the default
was specified and the argument was given as well.  This was especially
problematic for the FileType type, as a default file would always be
opened, even if a file argument was specified on the command line.

Patch by Arnaud Fontaine, with additional test by Mike Meyer.
2012-08-31 23:09:34 -04:00
R David Murray 6fb8fb17bf #12776,#11839: call argparse type function only once.
Before, the type function was called twice in the case where the default
was specified and the argument was given as well.  This was especially
problematic for the FileType type, as a default file would always be
opened, even if a file argument was specified on the command line.

Patch by Arnaud Fontaine, with additional test by Mike Meyer.
2012-08-31 22:45:20 -04:00
R David Murray 45ccf032be Merge #13922: argparse no longer incorrectly strips '--' after the first one.
Patch by Jeff Knupp.
2012-07-21 22:56:49 -04:00
R David Murray 00528e8fec #13922: argparse no longer incorrectly strips '--' after the first one.
Patch by Jeff Knupp.
2012-07-21 22:48:35 -04:00
R David Murray d4703d1d85 Merge #12353: argparse now correctly handles null argument values.
Patch by Torsten Landschoff.
2012-07-21 22:28:08 -04:00
R David Murray b94082a71b #12353: argparse now correctly handles null argument values.
Patch by Torsten Landschoff.
2012-07-21 22:20:11 -04:00
Florent Xicluna af1adbeedd Issue #13248: argparse: Remove obsolete argument "version" of ArgumentParser. 2012-07-07 17:02:22 +02:00
Terry Jan Reedy ee91e0990a #11906 Make test_argparse work interactively by removing extra space
in comparison string that argparse does not add when program name is blank.
2012-01-09 18:20:09 -05:00
Terry Jan Reedy 8d172343ad Merge with 3.2 2012-01-09 18:33:27 -05:00
Victor Stinner 242b6ea975 (Merge 3.2) Close #13401: Skip TestFileTypeW of test_argparse if the current user is root
Patch written by Arfrever Frehtes Taifersar Arahesis.
2011-11-20 23:10:12 +01:00
Victor Stinner a04b39b261 Close #13401: Skip TestFileTypeW of test_argparse if the current user is root
Patch written by Arfrever Frehtes Taifersar Arahesis.
2011-11-20 23:09:09 +01:00
R David Murray f97c59aaba #10424: argument names are now included in the missing argument message
Fix and initial test patch by Michele Orrù.
2011-06-09 12:34:07 -04:00
Steven Bethard 7c8ea37d9b Issue #9347: Fix formatting for tuples in argparse type= error messages. 2011-04-04 02:10:40 +02:00
Steven Bethard 7cb20a8605 Issue #9347: Fix formatting for tuples in argparse type= error messages. 2011-04-04 01:53:02 +02:00
Steven Bethard 4ad8f66559 Issue #9026: Fix order of argparse sub-commands in help messages. (Merged from 3.2.) 2011-03-27 14:04:03 +02:00
Steven Bethard 8a6a198abf Issue #9026: Fix order of argparse sub-commands in help messages. 2011-03-27 13:53:53 +02:00
Steven Bethard edbe4c5249 Issue #9348: Raise an early error if argparse nargs and metavar don't match. (Merge from 3.2.) 2011-03-26 17:35:11 +01:00
Steven Bethard 8d9a4628c3 Issue #9348: Raise an early error if argparse nargs and metavar don't match. 2011-03-26 17:33:56 +01:00
Steven Bethard 0331e906d6 Issue #11174: Add argparse.MetavarTypeHelpFormatter, which uses type names
for the names of optional and positional arguments in help messages.
2011-03-26 14:48:04 +01:00
Marc-André Lemburg 8f36af7a4c Normalize the encoding names for Latin-1 and UTF-8 to
'latin-1' and 'utf-8'.

These are optimized in the Python Unicode implementation
to result in more direct processing, bypassing the codec
registry.

Also see issue11303.
2011-02-25 15:42:01 +00:00
Georg Brandl 0f6b47a338 #10680: fix mutually exclusive arguments in argument groups. 2011-01-30 12:19:35 +00:00
Steven Bethard b02701101b Issue #9509: make argarse properly handle IOErrors raised by argparse.FileType. Approved by Georg in the tracker. 2011-01-24 21:02:50 +00:00
Steven Bethard fd311a712d Add subparser aliases for argparse. Resolves issue 9324. Approved by Georg for beta2 on the tracker. 2010-12-18 11:19:23 +00:00
Éric Araujo 1215915045 Use proper plural forms in argparse (#4391) 2010-12-04 17:31:49 +00:00
Ezio Melotti b3aedd4862 #9424: Replace deprecated assert* methods in the Python test suite. 2010-11-20 19:04:17 +00:00
R. David Murray 722b5fdbb8 Make test class name unique so that both test classes run. 2010-11-20 03:48:58 +00:00
Steven Bethard fca2e8aeb8 Fix bug 9340 - argparse parse_known_args didn't work with subparsers 2010-11-02 12:47:22 +00:00
Steven Bethard 49998eec49 Fix for issue 9355 where with multiple mutually exclusive arguments, some brackets were being lost in the usage messages 2010-11-01 16:29:26 +00:00
Steven Bethard 1ca45a5292 Fix bug 9352 where characters were being lost in parsing some short options 2010-11-01 15:57:36 +00:00
Steven Bethard 72c553829a Get argparse.__all__ back up to date (issue 9353) 2010-11-01 15:23:12 +00:00
Steven Bethard 1f1c247adb Unset COLUMNS for test_argparse (and restore afterwards) (issue 9553) 2010-11-01 13:56:09 +00:00
Antoine Pitrou b86680e299 Explicitly close some files (from issue #10093) 2010-10-14 21:15:17 +00:00
R. David Murray 88c49fe320 #9444: use first of prefix_chars for help opt instead of raising error
An argparse option parser created with a prefix_chars that did not
include a '-' would happily add -h and --help options, and then throw
an error when it tried to format the help because the - was an invalid
prefix character.  This patch makes it use the first character of
prefix_chars as the character for the help options if and only if '-'
is not one of the valid prefix_chars.

Fix by Theodore Turocy, unit tests by Catherine Devlin.
2010-08-03 17:56:09 +00:00
Steven Bethard 50fe593ae9 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
........
2010-05-24 03:47:38 +00:00
Benjamin Peterson b48af54ff7 Merged revisions 79464,79471,79623,79626,79630,79632,79643,79648-79649,79679,79685,79711,79761,79774,79777,79792-79794,79877,79898-79900 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79464 | michael.foord | 2010-03-27 07:55:19 -0500 (Sat, 27 Mar 2010) | 1 line

  A fix for running unittest tests on platforms without the audioop module (e.g. jython and IronPython)
........
  r79471 | michael.foord | 2010-03-27 14:10:11 -0500 (Sat, 27 Mar 2010) | 4 lines

  Addition of delta keyword argument to unittest.TestCase.assertAlmostEquals and assertNotAlmostEquals

  This allows the comparison of objects by specifying a maximum difference; this includes the comparing of non-numeric objects that don't support rounding.
........
  r79623 | michael.foord | 2010-04-02 16:42:47 -0500 (Fri, 02 Apr 2010) | 1 line

  Addition of -b command line option to unittest for buffering stdout and stderr during test runs.
........
  r79626 | michael.foord | 2010-04-02 17:08:29 -0500 (Fri, 02 Apr 2010) | 1 line

  TestResult stores original sys.stdout and tests no longer use sys.__stdout__ (etc) in tests for unittest -b command line option
........
  r79630 | michael.foord | 2010-04-02 17:30:56 -0500 (Fri, 02 Apr 2010) | 1 line

  unittest tests no longer replace the sys.stdout put in place by regrtest
........
  r79632 | michael.foord | 2010-04-02 17:55:59 -0500 (Fri, 02 Apr 2010) | 1 line

  Issue #8038: Addition of unittest.TestCase.assertNotRegexpMatches
........
  r79643 | michael.foord | 2010-04-02 20:15:21 -0500 (Fri, 02 Apr 2010) | 1 line

  Support dotted module names for test discovery paths in unittest. Issue 8038.
........
  r79648 | michael.foord | 2010-04-02 21:21:39 -0500 (Fri, 02 Apr 2010) | 1 line

  Cross platform unittest.TestResult newline handling when buffering stdout / stderr.
........
  r79649 | michael.foord | 2010-04-02 21:33:55 -0500 (Fri, 02 Apr 2010) | 1 line

  Another attempt at a fix for unittest.test.test_result for windows line endings
........
  r79679 | michael.foord | 2010-04-03 09:52:18 -0500 (Sat, 03 Apr 2010) | 1 line

  Adding -b command line option to the unittest usage message.
........
  r79685 | michael.foord | 2010-04-03 10:20:00 -0500 (Sat, 03 Apr 2010) | 1 line

  Minor tweak to unittest command line usage message
........
  r79711 | michael.foord | 2010-04-03 12:03:11 -0500 (Sat, 03 Apr 2010) | 1 line

  Documenting new features in unittest
........
  r79761 | michael.foord | 2010-04-04 17:41:54 -0500 (Sun, 04 Apr 2010) | 1 line

  unittest documentation formatting changes
........
  r79774 | michael.foord | 2010-04-04 18:28:44 -0500 (Sun, 04 Apr 2010) | 1 line

  Adding documentation for new unittest.main() parameters
........
  r79777 | michael.foord | 2010-04-04 19:39:50 -0500 (Sun, 04 Apr 2010) | 1 line

  Document signal handling functions in unittest.rst
........
  r79792 | michael.foord | 2010-04-05 05:26:26 -0500 (Mon, 05 Apr 2010) | 1 line

  Documentation fixes for unittest
........
  r79793 | michael.foord | 2010-04-05 05:28:27 -0500 (Mon, 05 Apr 2010) | 1 line

  Furterh documentation fix for unittest.rst
........
  r79794 | michael.foord | 2010-04-05 05:30:14 -0500 (Mon, 05 Apr 2010) | 1 line

  Further documentation fix for unittest.rst
........
  r79877 | michael.foord | 2010-04-06 18:18:16 -0500 (Tue, 06 Apr 2010) | 1 line

  Fix module directory finding logic for dotted paths in unittest test discovery.
........
  r79898 | michael.foord | 2010-04-07 18:04:22 -0500 (Wed, 07 Apr 2010) | 1 line

  unittest.result.TestResult does not create its buffers until they're used. It uses StringIO not cStringIO. Issue 8333.
........
  r79899 | michael.foord | 2010-04-07 19:04:24 -0500 (Wed, 07 Apr 2010) | 1 line

  Switch regrtest to use StringIO instead of cStringIO for test_multiprocessing on Windows. Issue 8333.
........
  r79900 | michael.foord | 2010-04-07 23:33:20 -0500 (Wed, 07 Apr 2010) | 1 line

  Correction of unittest documentation typos and omissions
........
2010-04-11 20:43:16 +00:00
Florent Xicluna 41fe615539 (partially)
Merged revisions 79534,79537,79539,79558,79606 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79534 | florent.xicluna | 2010-03-31 23:21:54 +0200 (mer, 31 mar 2010) | 2 lines

  Fix test for xml.etree when using a non-ascii path.  And use check_warnings instead of catch_warnings.
........
  r79537 | florent.xicluna | 2010-03-31 23:40:32 +0200 (mer, 31 mar 2010) | 2 lines

  Fix typo
........
  r79539 | florent.xicluna | 2010-04-01 00:01:03 +0200 (jeu, 01 avr 2010) | 2 lines

  Replace catch_warnings with check_warnings when it makes sense.  Use assertRaises context manager to simplify some tests.
........
  r79558 | florent.xicluna | 2010-04-01 20:17:09 +0200 (jeu, 01 avr 2010) | 2 lines

  #7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote.
........
  r79606 | florent.xicluna | 2010-04-02 19:26:42 +0200 (ven, 02 avr 2010) | 2 lines

  Backport some robotparser test and skip the test if the external resource is not available.
........
2010-04-02 18:52:12 +00:00
Steven Bethard cd4ec0e273 Merged revisions 79388 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79388 | steven.bethard | 2010-03-24 16:03:24 -0700 (Wed, 24 Mar 2010) | 1 line

  Replace license with simple attribution.
........
2010-03-24 23:07:31 +00:00
Benjamin Peterson 4fd181c1fb Merged revisions 78604 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78604 | benjamin.peterson | 2010-03-02 17:43:47 -0600 (Tue, 02 Mar 2010) | 1 line

  plug ref leaks
........
2010-03-02 23:46:42 +00:00
Benjamin Peterson 16f2fd013d Merged revisions 78600-78601 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78600 | benjamin.peterson | 2010-03-02 16:58:01 -0600 (Tue, 02 Mar 2010) | 1 line

  remove code to avoid BaseException.message bug
........
  r78601 | benjamin.peterson | 2010-03-02 17:02:02 -0600 (Tue, 02 Mar 2010) | 1 line

  remove cross-version compatibility code
........
2010-03-02 23:09:38 +00:00
Benjamin Peterson 698a18aa9e Merged revisions 78586-78593 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78586 | benjamin.peterson | 2010-03-02 16:03:03 -0600 (Tue, 02 Mar 2010) | 1 line

  remove coding cookie as mandated by PEP 8
........
  r78587 | benjamin.peterson | 2010-03-02 16:05:59 -0600 (Tue, 02 Mar 2010) | 1 line

  set svn:eol-style
........
  r78588 | benjamin.peterson | 2010-03-02 16:08:40 -0600 (Tue, 02 Mar 2010) | 1 line

  remove another coding cookie
........
  r78589 | georg.brandl | 2010-03-02 16:17:38 -0600 (Tue, 02 Mar 2010) | 1 line

  Add some x-refs.
........
  r78590 | benjamin.peterson | 2010-03-02 16:20:10 -0600 (Tue, 02 Mar 2010) | 1 line

  enable running of argparse tests and fix two that failed in the new environment
........
  r78591 | benjamin.peterson | 2010-03-02 16:23:33 -0600 (Tue, 02 Mar 2010) | 1 line

  prevent warning filter adjustment from altering other tests
........
  r78592 | benjamin.peterson | 2010-03-02 16:24:30 -0600 (Tue, 02 Mar 2010) | 1 line

  use test_main() in __main__ section
........
  r78593 | benjamin.peterson | 2010-03-02 16:26:25 -0600 (Tue, 02 Mar 2010) | 1 line

  convert deprecated fail* methods to assert* variants
........
2010-03-02 22:34:37 +00:00
Steven Bethard 6d265699e6 Merged revisions 78576 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78576 | steven.bethard | 2010-03-02 00:38:09 -0800 (Tue, 02 Mar 2010) | 3 lines

  Initial commit of the argparse library, based on argparse 1.1.
  Docs still need some updating to make getopt and optparse match the wording promised in the PEP.
  There are also probably a number of :class:ArgumentParser etc. links that could be added to the argparse documentation.
........
2010-03-02 09:22:57 +00:00