cpython-lru_cache-weakref: Lib/optparse.py annotate

annotate Lib/optparse.py @ 49961:e793fc3c8abe

More 3.0 -> 3.1 transistion in the Windows and OS/2 build files

author	Christian Heimes <christian@cheimes.de>
date	Thu, 04 Dec 2008 14:27:25 +0000
parents	ed8adfef26c6
children	d06a3ebf306f

rev	line source
49493 bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	1 """A powerful, extensible, and easy-to-use option parser.
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	2
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	3 By Greg Ward <gward@python.net>
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	4
49493 bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	5 Originally distributed as Optik.
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	6
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	7 For support, use the optik-users@lists.sourceforge.net mailing list
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	8 (http://lists.sourceforge.net/lists/listinfo/optik-users).
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	9 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	10
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	11 __version__ = "1.5.3"
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	12
29021 2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	13 __all__ = ['Option',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	14 'SUPPRESS_HELP',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	15 'SUPPRESS_USAGE',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	16 'Values',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	17 'OptionContainer',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	18 'OptionGroup',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	19 'OptionParser',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	20 'HelpFormatter',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	21 'IndentedHelpFormatter',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	22 'TitledHelpFormatter',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	23 'OptParseError',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	24 'OptionError',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	25 'OptionConflictError',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	26 'OptionValueError',
2f652a59ebb0 Update to Optik 1.4.1+: adds __all__ (Optik SF bug #728563). Greg Ward <gward@python.net> parents: 28774 diff changeset	27 'BadOptionError']
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	28
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	29 __copyright__ = """
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	30 Copyright (c) 2001-2006 Gregory P. Ward. All rights reserved.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	31 Copyright (c) 2002-2006 Python Software Foundation. All rights reserved.
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	32
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	33 Redistribution and use in source and binary forms, with or without
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	34 modification, are permitted provided that the following conditions are
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	35 met:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	36
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	37 * Redistributions of source code must retain the above copyright
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	38 notice, this list of conditions and the following disclaimer.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	39
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	40 * Redistributions in binary form must reproduce the above copyright
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	41 notice, this list of conditions and the following disclaimer in the
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	42 documentation and/or other materials provided with the distribution.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	43
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	44 * Neither the name of the author nor the names of its
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	45 contributors may be used to endorse or promote products derived from
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	46 this software without specific prior written permission.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	47
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	48 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	49 IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	50 TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	51 PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	52 CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	53 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	54 PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	55 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	56 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	57 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	58 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	59 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	60
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	61 import sys, os
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	62 import textwrap
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	63
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	64 def _repr(self):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	65 return "<%s at 0x%x: %s>" % (self.__class__.__name__, id(self), self)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	66
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	67
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	68 # This file was generated from:
39442 654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	69 # Id: option_parser.py 527 2006-07-23 15:21:30Z greg
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	70 # Id: option.py 522 2006-06-11 16:22:03Z gward
654c380cf8b9 Merged revisions 46753-51188 via svnmerge from Thomas Wouters <thomas@python.org> parents: 38669 diff changeset	71 # Id: help.py 527 2006-07-23 15:21:30Z greg
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	72 # Id: errors.py 509 2006-04-20 00:58:24Z gward
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	73
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	74 try:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	75 from gettext import gettext
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	76 except ImportError:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	77 def gettext(message):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	78 return message
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	79 _ = gettext
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	80
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	81
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	82 class OptParseError (Exception):
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	83 def __init__(self, msg):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	84 self.msg = msg
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	85
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	86 def __str__(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	87 return self.msg
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	88
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	89
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	90 class OptionError (OptParseError):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	91 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	92 Raised if an Option instance is created with invalid or
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	93 inconsistent arguments.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	94 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	95
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	96 def __init__(self, msg, option):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	97 self.msg = msg
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	98 self.option_id = str(option)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	99
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	100 def __str__(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	101 if self.option_id:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	102 return "option %s: %s" % (self.option_id, self.msg)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	103 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	104 return self.msg
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	105
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	106 class OptionConflictError (OptionError):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	107 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	108 Raised if conflicting options are added to an OptionParser.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	109 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	110
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	111 class OptionValueError (OptParseError):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	112 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	113 Raised if an invalid option value is encountered on the command
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	114 line.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	115 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	116
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	117 class BadOptionError (OptParseError):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	118 """
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	119 Raised if an invalid option is seen on the command line.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	120 """
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	121 def __init__(self, opt_str):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	122 self.opt_str = opt_str
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	123
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	124 def __str__(self):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	125 return _("no such option: %s") % self.opt_str
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	126
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	127 class AmbiguousOptionError (BadOptionError):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	128 """
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	129 Raised if an ambiguous option is seen on the command line.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	130 """
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	131 def __init__(self, opt_str, possibilities):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	132 BadOptionError.__init__(self, opt_str)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	133 self.possibilities = possibilities
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	134
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	135 def __str__(self):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	136 return (_("ambiguous option: %s (%s?)")
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	137 % (self.opt_str, ", ".join(self.possibilities)))
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	138
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	139
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	140 class HelpFormatter:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	141
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	142 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	143 Abstract base class for formatting option help. OptionParser
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	144 instances should use one of the HelpFormatter subclasses for
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	145 formatting help; by default IndentedHelpFormatter is used.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	146
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	147 Instance attributes:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	148 parser : OptionParser
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	149 the controlling OptionParser instance
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	150 indent_increment : int
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	151 the number of columns to indent per nesting level
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	152 max_help_position : int
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	153 the maximum starting column for option help text
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	154 help_position : int
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	155 the calculated starting column for option help text;
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	156 initially the same as the maximum
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	157 width : int
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	158 total number of columns for output (pass None to constructor for
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	159 this value to be taken from the $COLUMNS environment variable)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	160 level : int
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	161 current indentation level
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	162 current_indent : int
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	163 current indentation level (in columns)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	164 help_width : int
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	165 number of columns available for option help text (calculated)
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	166 default_tag : str
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	167 text to replace with each option's default value, "%default"
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	168 by default. Set to false value to disable default value expansion.
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	169 option_strings : { Option : str }
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	170 maps Option instances to the snippet of help text explaining
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	171 the syntax of that option, e.g. "-h, --help" or
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	172 "-fFILE, --file=FILE"
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	173 _short_opt_fmt : str
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	174 format string controlling how short options with values are
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	175 printed in help text. Must be either "%s%s" ("-fFILE") or
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	176 "%s %s" ("-f FILE"), because those are the two syntaxes that
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	177 Optik supports.
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	178 _long_opt_fmt : str
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	179 similar but for long options; must be either "%s %s" ("--file FILE")
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	180 or "%s=%s" ("--file=FILE").
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	181 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	182
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	183 NO_DEFAULT_VALUE = "none"
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	184
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	185 def __init__(self,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	186 indent_increment,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	187 max_help_position,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	188 width,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	189 short_first):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	190 self.parser = None
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	191 self.indent_increment = indent_increment
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	192 self.help_position = self.max_help_position = max_help_position
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	193 if width is None:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	194 try:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	195 width = int(os.environ['COLUMNS'])
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	196 except (KeyError, ValueError):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	197 width = 80
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	198 width -= 2
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	199 self.width = width
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	200 self.current_indent = 0
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	201 self.level = 0
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	202 self.help_width = None # computed later
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	203 self.short_first = short_first
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	204 self.default_tag = "%default"
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	205 self.option_strings = {}
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	206 self._short_opt_fmt = "%s %s"
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	207 self._long_opt_fmt = "%s=%s"
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	208
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	209 def set_parser(self, parser):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	210 self.parser = parser
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	211
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	212 def set_short_opt_delimiter(self, delim):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	213 if delim not in ("", " "):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	214 raise ValueError(
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	215 "invalid metavar delimiter for short options: %r" % delim)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	216 self._short_opt_fmt = "%s" + delim + "%s"
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	217
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	218 def set_long_opt_delimiter(self, delim):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	219 if delim not in ("=", " "):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	220 raise ValueError(
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	221 "invalid metavar delimiter for long options: %r" % delim)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	222 self._long_opt_fmt = "%s" + delim + "%s"
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	223
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	224 def indent(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	225 self.current_indent += self.indent_increment
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	226 self.level += 1
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	227
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	228 def dedent(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	229 self.current_indent -= self.indent_increment
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	230 assert self.current_indent >= 0, "Indent decreased below 0."
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	231 self.level -= 1
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	232
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	233 def format_usage(self, usage):
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42552 diff changeset	234 raise NotImplementedError("subclasses must implement")
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	235
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	236 def format_heading(self, heading):
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42552 diff changeset	237 raise NotImplementedError("subclasses must implement")
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	238
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	239 def _format_text(self, text):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	240 """
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	241 Format a paragraph of free-form text for inclusion in the
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	242 help output at the current indentation level.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	243 """
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	244 text_width = self.width - self.current_indent
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	245 indent = " "*self.current_indent
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	246 return textwrap.fill(text,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	247 text_width,
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	248 initial_indent=indent,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	249 subsequent_indent=indent)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	250
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	251 def format_description(self, description):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	252 if description:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	253 return self._format_text(description) + "\n"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	254 else:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	255 return ""
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	256
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	257 def format_epilog(self, epilog):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	258 if epilog:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	259 return "\n" + self._format_text(epilog) + "\n"
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	260 else:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	261 return ""
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	262
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	263
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	264 def expand_default(self, option):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	265 if self.parser is None or not self.default_tag:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	266 return option.help
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	267
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	268 default_value = self.parser.defaults.get(option.dest)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	269 if default_value is NO_DEFAULT or default_value is None:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	270 default_value = self.NO_DEFAULT_VALUE
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	271
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	272 return option.help.replace(self.default_tag, str(default_value))
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	273
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	274 def format_option(self, option):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	275 # The help for each option consists of two parts:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	276 # * the opt strings and metavars
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	277 # eg. ("-x", or "-fFILENAME, --file=FILENAME")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	278 # * the user-supplied help string
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	279 # eg. ("turn on expert mode", "read data from FILENAME")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	280 #
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	281 # If possible, we write both of these on the same line:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	282 # -x turn on expert mode
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	283 #
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	284 # But if the opt string list is too long, we put the help
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	285 # string on a second line, indented to the same column it would
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	286 # start in if it fit on the first line.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	287 # -fFILENAME, --file=FILENAME
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	288 # read data from FILENAME
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	289 result = []
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	290 opts = self.option_strings[option]
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	291 opt_width = self.help_position - self.current_indent - 2
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	292 if len(opts) > opt_width:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	293 opts = "%*s%s\n" % (self.current_indent, "", opts)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	294 indent_first = self.help_position
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	295 else: # start help on same line as opts
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	296 opts = "%s%-s " % (self.current_indent, "", opt_width, opts)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	297 indent_first = 0
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	298 result.append(opts)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	299 if option.help:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	300 help_text = self.expand_default(option)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	301 help_lines = textwrap.wrap(help_text, self.help_width)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	302 result.append("%*s%s\n" % (indent_first, "", help_lines[0]))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	303 result.extend(["%*s%s\n" % (self.help_position, "", line)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	304 for line in help_lines[1:]])
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	305 elif opts[-1] != "\n":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	306 result.append("\n")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	307 return "".join(result)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	308
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	309 def store_option_strings(self, parser):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	310 self.indent()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	311 max_len = 0
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	312 for opt in parser.option_list:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	313 strings = self.format_option_strings(opt)
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	314 self.option_strings[opt] = strings
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	315 max_len = max(max_len, len(strings) + self.current_indent)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	316 self.indent()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	317 for group in parser.option_groups:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	318 for opt in group.option_list:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	319 strings = self.format_option_strings(opt)
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	320 self.option_strings[opt] = strings
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	321 max_len = max(max_len, len(strings) + self.current_indent)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	322 self.dedent()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	323 self.dedent()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	324 self.help_position = min(max_len + 2, self.max_help_position)
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	325 self.help_width = self.width - self.help_position
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	326
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	327 def format_option_strings(self, option):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	328 """Return a comma-separated list of option strings & metavariables."""
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	329 if option.takes_value():
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	330 metavar = option.metavar or option.dest.upper()
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	331 short_opts = [self._short_opt_fmt % (sopt, metavar)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	332 for sopt in option._short_opts]
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	333 long_opts = [self._long_opt_fmt % (lopt, metavar)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	334 for lopt in option._long_opts]
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	335 else:
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	336 short_opts = option._short_opts
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	337 long_opts = option._long_opts
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	338
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	339 if self.short_first:
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	340 opts = short_opts + long_opts
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	341 else:
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	342 opts = long_opts + short_opts
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	343
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	344 return ", ".join(opts)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	345
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	346 class IndentedHelpFormatter (HelpFormatter):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	347 """Format help with indented section bodies.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	348 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	349
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	350 def __init__(self,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	351 indent_increment=2,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	352 max_help_position=24,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	353 width=None,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	354 short_first=1):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	355 HelpFormatter.__init__(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	356 self, indent_increment, max_help_position, width, short_first)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	357
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	358 def format_usage(self, usage):
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	359 return _("Usage: %s\n") % usage
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	360
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	361 def format_heading(self, heading):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	362 return "%*s%s:\n" % (self.current_indent, "", heading)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	363
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	364
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	365 class TitledHelpFormatter (HelpFormatter):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	366 """Format help with underlined section headers.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	367 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	368
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	369 def __init__(self,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	370 indent_increment=0,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	371 max_help_position=24,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	372 width=None,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	373 short_first=0):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	374 HelpFormatter.__init__ (
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	375 self, indent_increment, max_help_position, width, short_first)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	376
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	377 def format_usage(self, usage):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	378 return "%s %s\n" % (self.format_heading(_("Usage")), usage)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	379
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	380 def format_heading(self, heading):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	381 return "%s\n%s\n" % (heading, "=-"[self.level] * len(heading))
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	382
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	383
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	384 def _parse_num(val, type):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	385 if val[:2].lower() == "0x": # hexadecimal
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	386 radix = 16
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	387 elif val[:2].lower() == "0b": # binary
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	388 radix = 2
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	389 val = val[2:] or "0" # have to remove "0b" prefix
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	390 elif val[:1] == "0": # octal
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	391 radix = 8
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	392 else: # decimal
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	393 radix = 10
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	394
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	395 return type(val, radix)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	396
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	397 def _parse_int(val):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	398 return _parse_num(val, int)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	399
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	400 def _parse_long(val):
40644 1c26505c1de6 Rip out 'long' and 'L'-suffixed integer literals. Guido van Rossum <guido@python.org> parents: 40587 diff changeset	401 return _parse_num(val, int)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	402
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	403 _builtin_cvt = { "int" : (_parse_int, _("integer")),
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	404 "long" : (_parse_long, _("long integer")),
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	405 "float" : (float, _("floating-point")),
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	406 "complex" : (complex, _("complex")) }
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	407
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	408 def check_builtin(option, opt, value):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	409 (cvt, what) = _builtin_cvt[option.type]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	410 try:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	411 return cvt(value)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	412 except ValueError:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	413 raise OptionValueError(
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	414 _("option %s: invalid %s value: %r") % (opt, what, value))
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	415
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	416 def check_choice(option, opt, value):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	417 if value in option.choices:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	418 return value
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	419 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	420 choices = ", ".join(map(repr, option.choices))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	421 raise OptionValueError(
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	422 _("option %s: invalid choice: %r (choose from %s)")
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	423 % (opt, value, choices))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	424
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	425 # Not supplying a default is different from a default of None,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	426 # so we need an explicit "not supplied" value.
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	427 NO_DEFAULT = ("NO", "DEFAULT")
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	428
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	429
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	430 class Option:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	431 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	432 Instance attributes:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	433 _short_opts : [string]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	434 _long_opts : [string]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	435
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	436 action : string
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	437 type : string
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	438 dest : string
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	439 default : any
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	440 nargs : int
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	441 const : any
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	442 choices : [string]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	443 callback : function
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	444 callback_args : (any*)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	445 callback_kwargs : { string : any }
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	446 help : string
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	447 metavar : string
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	448 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	449
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	450 # The list of instance attributes that may be set through
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	451 # keyword args to the constructor.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	452 ATTRS = ['action',
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	453 'type',
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	454 'dest',
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	455 'default',
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	456 'nargs',
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	457 'const',
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	458 'choices',
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	459 'callback',
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	460 'callback_args',
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	461 'callback_kwargs',
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	462 'help',
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	463 'metavar']
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	464
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	465 # The set of actions allowed by option parsers. Explicitly listed
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	466 # here so the constructor can validate its arguments.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	467 ACTIONS = ("store",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	468 "store_const",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	469 "store_true",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	470 "store_false",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	471 "append",
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	472 "append_const",
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	473 "count",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	474 "callback",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	475 "help",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	476 "version")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	477
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	478 # The set of actions that involve storing a value somewhere;
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	479 # also listed just for constructor argument validation. (If
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	480 # the action is one of these, there must be a destination.)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	481 STORE_ACTIONS = ("store",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	482 "store_const",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	483 "store_true",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	484 "store_false",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	485 "append",
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	486 "append_const",
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	487 "count")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	488
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	489 # The set of actions for which it makes sense to supply a value
33846 79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	490 # type, ie. which may consume an argument from the command line.
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	491 TYPED_ACTIONS = ("store",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	492 "append",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	493 "callback")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	494
33846 79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	495 # The set of actions which require a value type, ie. that
79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	496 # always consume an argument from the command line.
79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	497 ALWAYS_TYPED_ACTIONS = ("store",
79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	498 "append")
79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	499
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	500 # The set of actions which take a 'const' attribute.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	501 CONST_ACTIONS = ("store_const",
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	502 "append_const")
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	503
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	504 # The set of known types for option parsers. Again, listed here for
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	505 # constructor argument validation.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	506 TYPES = ("string", "int", "long", "float", "complex", "choice")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	507
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	508 # Dictionary of argument checking functions, which convert and
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	509 # validate option arguments according to the option type.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	510 #
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	511 # Signature of checking functions is:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	512 # check(option : Option, opt : string, value : string) -> any
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	513 # where
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	514 # option is the Option instance calling the checker
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	515 # opt is the actual option seen on the command-line
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	516 # (eg. "-a", "--file")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	517 # value is the option argument seen on the command-line
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	518 #
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	519 # The return value should be in the appropriate Python type
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	520 # for option.type -- eg. an integer if option.type == "int".
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	521 #
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	522 # If no checker is defined for a type, arguments will be
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	523 # unchecked and remain strings.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	524 TYPE_CHECKER = { "int" : check_builtin,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	525 "long" : check_builtin,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	526 "float" : check_builtin,
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	527 "complex": check_builtin,
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	528 "choice" : check_choice,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	529 }
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	530
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	531
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	532 # CHECK_METHODS is a list of unbound method objects; they are called
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	533 # by the constructor, in order, after all attributes are
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	534 # initialized. The list is created and filled in later, after all
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	535 # the methods are actually defined. (I just put it here because I
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	536 # like to define and document all class attributes in the same
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	537 # place.) Subclasses that add another _check_*() method should
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	538 # define their own CHECK_METHODS list that adds their check method
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	539 # to those from this class.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	540 CHECK_METHODS = None
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	541
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	542
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	543 # -- Constructor/initialization methods ----------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	544
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	545 def __init__(self, opts, *attrs):
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	546 # Set _short_opts, _long_opts attrs from 'opts' tuple.
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	547 # Have to be set now, in case no option strings are supplied.
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	548 self._short_opts = []
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	549 self._long_opts = []
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	550 opts = self._check_opt_strings(opts)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	551 self._set_opt_strings(opts)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	552
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	553 # Set all other attrs (action, type, etc.) from 'attrs' dict
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	554 self._set_attrs(attrs)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	555
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	556 # Check all the attributes we just set. There are lots of
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	557 # complicated interdependencies, but luckily they can be farmed
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	558 # out to the _check_*() methods listed in CHECK_METHODS -- which
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	559 # could be handy for subclasses! The one thing these all share
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	560 # is that they raise OptionError if they discover a problem.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	561 for checker in self.CHECK_METHODS:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	562 checker(self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	563
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	564 def _check_opt_strings(self, opts):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	565 # Filter out None because early versions of Optik had exactly
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	566 # one short option and one long option, either of which
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	567 # could be None.
42142 a53e48be6df9 Merged revisions 56125-56153 via svnmerge from Guido van Rossum <guido@python.org> parents: 41986 diff changeset	568 opts = [opt for opt in opts if opt]
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	569 if not opts:
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	570 raise TypeError("at least one option string must be supplied")
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	571 return opts
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	572
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	573 def _set_opt_strings(self, opts):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	574 for opt in opts:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	575 if len(opt) < 2:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	576 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	577 "invalid option string %r: "
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	578 "must be at least two characters long" % opt, self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	579 elif len(opt) == 2:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	580 if not (opt[0] == "-" and opt[1] != "-"):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	581 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	582 "invalid short option string %r: "
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	583 "must be of the form -x, (x any non-dash char)" % opt,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	584 self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	585 self._short_opts.append(opt)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	586 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	587 if not (opt[0:2] == "--" and opt[2] != "-"):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	588 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	589 "invalid long option string %r: "
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	590 "must start with --, followed by non-dash" % opt,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	591 self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	592 self._long_opts.append(opt)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	593
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	594 def _set_attrs(self, attrs):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	595 for attr in self.ATTRS:
39575 63237fcefd99 Get rid of dict.has_key(). Boy this has a lot of repercussions! Guido van Rossum <guido@python.org> parents: 39442 diff changeset	596 if attr in attrs:
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	597 setattr(self, attr, attrs[attr])
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	598 del attrs[attr]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	599 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	600 if attr == 'default':
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	601 setattr(self, attr, NO_DEFAULT)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	602 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	603 setattr(self, attr, None)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	604 if attrs:
40819 5ef70c49d85a Checkin the regenerated Python-ast.c and fix test_optparse. Georg Brandl <georg@python.org> parents: 40775 diff changeset	605 attrs = sorted(attrs.keys())
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	606 raise OptionError(
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	607 "invalid keyword arguments: %s" % ", ".join(attrs),
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	608 self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	609
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	610
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	611 # -- Constructor validation methods --------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	612
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	613 def _check_action(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	614 if self.action is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	615 self.action = "store"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	616 elif self.action not in self.ACTIONS:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	617 raise OptionError("invalid action: %r" % self.action, self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	618
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	619 def _check_type(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	620 if self.type is None:
33846 79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	621 if self.action in self.ALWAYS_TYPED_ACTIONS:
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	622 if self.choices is not None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	623 # The "choices" attribute implies "choice" type.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	624 self.type = "choice"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	625 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	626 # No type given? "string" is the most sensible default.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	627 self.type = "string"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	628 else:
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	629 # Allow type objects or builtin type conversion functions
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	630 # (int, str, etc.) as an alternative to their names. (The
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 43577 diff changeset	631 # complicated check of builtins is only necessary for
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	632 # Python 2.1 and earlier, and is short-circuited by the
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	633 # first check on modern Pythons.)
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 43577 diff changeset	634 import builtins
41986 6464cc638faa Merged revisions 55795-55816 via svnmerge from Guido van Rossum <guido@python.org> parents: 41969 diff changeset	635 if ( isinstance(self.type, type) or
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	636 (hasattr(self.type, "__name__") and
44098 0889daf6d0d9 #1535: rename __builtin__ module to builtins. Georg Brandl <georg@python.org> parents: 43577 diff changeset	637 getattr(builtins, self.type.__name__, None) is self.type) ):
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	638 self.type = self.type.__name__
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	639
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	640 if self.type == "str":
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	641 self.type = "string"
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	642
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	643 if self.type not in self.TYPES:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	644 raise OptionError("invalid option type: %r" % self.type, self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	645 if self.action not in self.TYPED_ACTIONS:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	646 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	647 "must not supply a type for action %r" % self.action, self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	648
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	649 def _check_choice(self):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	650 if self.type == "choice":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	651 if self.choices is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	652 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	653 "must supply a list of choices for type 'choice'", self)
41986 6464cc638faa Merged revisions 55795-55816 via svnmerge from Guido van Rossum <guido@python.org> parents: 41969 diff changeset	654 elif not isinstance(self.choices, (tuple, list)):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	655 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	656 "choices must be a list of strings ('%s' supplied)"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	657 % str(type(self.choices)).split("'")[1], self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	658 elif self.choices is not None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	659 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	660 "must not supply choices for type %r" % self.type, self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	661
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	662 def _check_dest(self):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	663 # No destination given, and we need one for this action. The
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	664 # self.type check is for callbacks that take a value.
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	665 takes_value = (self.action in self.STORE_ACTIONS or
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	666 self.type is not None)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	667 if self.dest is None and takes_value:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	668
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	669 # Glean a destination from the first long option string,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	670 # or from the first short option string if no long options.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	671 if self._long_opts:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	672 # eg. "--foo-bar" -> "foo_bar"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	673 self.dest = self._long_opts[0][2:].replace('-', '_')
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	674 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	675 self.dest = self._short_opts[0][1]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	676
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	677 def _check_const(self):
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	678 if self.action not in self.CONST_ACTIONS and self.const is not None:
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	679 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	680 "'const' must not be supplied for action %r" % self.action,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	681 self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	682
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	683 def _check_nargs(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	684 if self.action in self.TYPED_ACTIONS:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	685 if self.nargs is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	686 self.nargs = 1
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	687 elif self.nargs is not None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	688 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	689 "'nargs' must not be supplied for action %r" % self.action,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	690 self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	691
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	692 def _check_callback(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	693 if self.action == "callback":
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41610 diff changeset	694 if not hasattr(self.callback, '__call__'):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	695 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	696 "callback not callable: %r" % self.callback, self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	697 if (self.callback_args is not None and
41986 6464cc638faa Merged revisions 55795-55816 via svnmerge from Guido van Rossum <guido@python.org> parents: 41969 diff changeset	698 not isinstance(self.callback_args, tuple)):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	699 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	700 "callback_args, if supplied, must be a tuple: not %r"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	701 % self.callback_args, self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	702 if (self.callback_kwargs is not None and
41986 6464cc638faa Merged revisions 55795-55816 via svnmerge from Guido van Rossum <guido@python.org> parents: 41969 diff changeset	703 not isinstance(self.callback_kwargs, dict)):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	704 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	705 "callback_kwargs, if supplied, must be a dict: not %r"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	706 % self.callback_kwargs, self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	707 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	708 if self.callback is not None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	709 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	710 "callback supplied (%r) for non-callback option"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	711 % self.callback, self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	712 if self.callback_args is not None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	713 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	714 "callback_args supplied for non-callback option", self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	715 if self.callback_kwargs is not None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	716 raise OptionError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	717 "callback_kwargs supplied for non-callback option", self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	718
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	719
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	720 CHECK_METHODS = [_check_action,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	721 _check_type,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	722 _check_choice,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	723 _check_dest,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	724 _check_const,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	725 _check_nargs,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	726 _check_callback]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	727
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	728
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	729 # -- Miscellaneous methods -----------------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	730
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	731 def __str__(self):
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	732 return "/".join(self._short_opts + self._long_opts)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	733
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	734 __repr__ = _repr
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	735
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	736 def takes_value(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	737 return self.type is not None
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	738
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	739 def get_opt_string(self):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	740 if self._long_opts:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	741 return self._long_opts[0]
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	742 else:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	743 return self._short_opts[0]
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	744
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	745
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	746 # -- Processing methods --------------------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	747
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	748 def check_value(self, opt, value):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	749 checker = self.TYPE_CHECKER.get(self.type)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	750 if checker is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	751 return value
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	752 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	753 return checker(self, opt, value)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	754
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	755 def convert_value(self, opt, value):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	756 if value is not None:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	757 if self.nargs == 1:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	758 return self.check_value(opt, value)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	759 else:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	760 return tuple([self.check_value(opt, v) for v in value])
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	761
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	762 def process(self, opt, value, values, parser):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	763
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	764 # First, convert the value(s) to the right type. Howl if any
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	765 # value(s) are bogus.
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	766 value = self.convert_value(opt, value)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	767
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	768 # And then take whatever action is expected of us.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	769 # This is a separate method to make life easier for
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	770 # subclasses to add new actions.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	771 return self.take_action(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	772 self.action, self.dest, opt, value, values, parser)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	773
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	774 def take_action(self, action, dest, opt, value, values, parser):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	775 if action == "store":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	776 setattr(values, dest, value)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	777 elif action == "store_const":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	778 setattr(values, dest, self.const)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	779 elif action == "store_true":
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	780 setattr(values, dest, True)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	781 elif action == "store_false":
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	782 setattr(values, dest, False)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	783 elif action == "append":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	784 values.ensure_value(dest, []).append(value)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	785 elif action == "append_const":
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	786 values.ensure_value(dest, []).append(self.const)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	787 elif action == "count":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	788 setattr(values, dest, values.ensure_value(dest, 0) + 1)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	789 elif action == "callback":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	790 args = self.callback_args or ()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	791 kwargs = self.callback_kwargs or {}
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	792 self.callback(self, opt, value, parser, args, *kwargs)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	793 elif action == "help":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	794 parser.print_help()
33846 79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	795 parser.exit()
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	796 elif action == "version":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	797 parser.print_version()
33846 79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	798 parser.exit()
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	799 else:
49908 ed8adfef26c6 Merged revisions 67348,67355,67359,67362,67364-67365,67367-67368,67398,67423-67424,67432,67440-67441,67444-67445,67454-67455,67457-67458 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49493 diff changeset	800 raise ValueError("unknown action %r" % self.action)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	801
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	802 return 1
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	803
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	804 # class Option
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	805
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	806
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	807 SUPPRESS_HELP = "SUPPRESS"+"HELP"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	808 SUPPRESS_USAGE = "SUPPRESS"+"USAGE"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	809
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	810 class Values:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	811
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	812 def __init__(self, defaults=None):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	813 if defaults:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	814 for (attr, val) in defaults.items():
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	815 setattr(self, attr, val)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	816
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	817 def __str__(self):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	818 return str(self.__dict__)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	819
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	820 __repr__ = _repr
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	821
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39589 diff changeset	822 def __eq__(self, other):
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	823 if isinstance(other, Values):
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39589 diff changeset	824 return self.__dict__ == other.__dict__
41986 6464cc638faa Merged revisions 55795-55816 via svnmerge from Guido van Rossum <guido@python.org> parents: 41969 diff changeset	825 elif isinstance(other, dict):
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39589 diff changeset	826 return self.__dict__ == other
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	827 else:
39644 13d5e5f0e993 Restructure comparison dramatically. There is no longer a default Guido van Rossum <guido@python.org> parents: 39589 diff changeset	828 return NotImplemented
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	829
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	830 def _update_careful(self, dict):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	831 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	832 Update the option values from an arbitrary dictionary, but only
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	833 use keys from dict that already have a corresponding attribute
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	834 in self. Any keys in dict without a corresponding attribute
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	835 are silently ignored.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	836 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	837 for attr in dir(self):
39575 63237fcefd99 Get rid of dict.has_key(). Boy this has a lot of repercussions! Guido van Rossum <guido@python.org> parents: 39442 diff changeset	838 if attr in dict:
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	839 dval = dict[attr]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	840 if dval is not None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	841 setattr(self, attr, dval)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	842
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	843 def _update_loose(self, dict):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	844 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	845 Update the option values from an arbitrary dictionary,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	846 using all keys from the dictionary regardless of whether
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	847 they have a corresponding attribute in self or not.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	848 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	849 self.__dict__.update(dict)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	850
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	851 def _update(self, dict, mode):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	852 if mode == "careful":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	853 self._update_careful(dict)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	854 elif mode == "loose":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	855 self._update_loose(dict)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	856 else:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42552 diff changeset	857 raise ValueError("invalid update mode: %r" % mode)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	858
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	859 def read_module(self, modname, mode="careful"):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	860 __import__(modname)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	861 mod = sys.modules[modname]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	862 self._update(vars(mod), mode)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	863
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	864 def read_file(self, filename, mode="careful"):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	865 vars = {}
42552 ac192f89c109 Kill execfile(), use exec() instead Neal Norwitz <nnorwitz@gmail.com> parents: 42501 diff changeset	866 exec(open(filename).read(), vars)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	867 self._update(vars, mode)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	868
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	869 def ensure_value(self, attr, value):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	870 if not hasattr(self, attr) or getattr(self, attr) is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	871 setattr(self, attr, value)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	872 return getattr(self, attr)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	873
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	874
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	875 class OptionContainer:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	876
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	877 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	878 Abstract base class.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	879
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	880 Class attributes:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	881 standard_option_list : [Option]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	882 list of standard options that will be accepted by all instances
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	883 of this parser class (intended to be overridden by subclasses).
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	884
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	885 Instance attributes:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	886 option_list : [Option]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	887 the list of Option objects contained by this OptionContainer
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	888 _short_opt : { string : Option }
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	889 dictionary mapping short option strings, eg. "-f" or "-X",
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	890 to the Option instances that implement them. If an Option
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	891 has multiple short option strings, it will appears in this
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	892 dictionary multiple times. [1]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	893 _long_opt : { string : Option }
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	894 dictionary mapping long option strings, eg. "--file" or
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	895 "--exclude", to the Option instances that implement them.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	896 Again, a given Option can occur multiple times in this
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	897 dictionary. [1]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	898 defaults : { string : any }
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	899 dictionary mapping option destination names to default
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	900 values for each destination [1]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	901
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	902 [1] These mappings are common to (shared by) all components of the
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	903 controlling OptionParser, where they are initially created.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	904
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	905 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	906
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	907 def __init__(self, option_class, conflict_handler, description):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	908 # Initialize the option list and related data structures.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	909 # This method must be provided by subclasses, and it must
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	910 # initialize at least the following instance attributes:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	911 # option_list, _short_opt, _long_opt, defaults.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	912 self._create_option_list()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	913
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	914 self.option_class = option_class
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	915 self.set_conflict_handler(conflict_handler)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	916 self.set_description(description)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	917
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	918 def _create_option_mappings(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	919 # For use by OptionParser constructor -- create the master
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	920 # option mappings used by this OptionParser and all
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	921 # OptionGroups that it owns.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	922 self._short_opt = {} # single letter -> Option instance
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	923 self._long_opt = {} # long option -> Option instance
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	924 self.defaults = {} # maps option dest -> default value
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	925
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	926
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	927 def _share_option_mappings(self, parser):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	928 # For use by OptionGroup constructor -- use shared option
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	929 # mappings from the OptionParser that owns this OptionGroup.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	930 self._short_opt = parser._short_opt
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	931 self._long_opt = parser._long_opt
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	932 self.defaults = parser.defaults
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	933
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	934 def set_conflict_handler(self, handler):
33846 79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	935 if handler not in ("error", "resolve"):
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42552 diff changeset	936 raise ValueError("invalid conflict_resolution value %r" % handler)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	937 self.conflict_handler = handler
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	938
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	939 def set_description(self, description):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	940 self.description = description
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	941
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	942 def get_description(self):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	943 return self.description
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	944
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	945
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	946 def destroy(self):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	947 """see OptionParser.destroy()."""
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	948 del self._short_opt
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	949 del self._long_opt
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	950 del self.defaults
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	951
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	952
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	953 # -- Option-adding methods -----------------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	954
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	955 def _check_conflict(self, option):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	956 conflict_opts = []
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	957 for opt in option._short_opts:
39575 63237fcefd99 Get rid of dict.has_key(). Boy this has a lot of repercussions! Guido van Rossum <guido@python.org> parents: 39442 diff changeset	958 if opt in self._short_opt:
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	959 conflict_opts.append((opt, self._short_opt[opt]))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	960 for opt in option._long_opts:
39575 63237fcefd99 Get rid of dict.has_key(). Boy this has a lot of repercussions! Guido van Rossum <guido@python.org> parents: 39442 diff changeset	961 if opt in self._long_opt:
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	962 conflict_opts.append((opt, self._long_opt[opt]))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	963
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	964 if conflict_opts:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	965 handler = self.conflict_handler
33846 79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	966 if handler == "error":
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	967 raise OptionConflictError(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	968 "conflicting option string(s): %s"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	969 % ", ".join([co[0] for co in conflict_opts]),
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	970 option)
33846 79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	971 elif handler == "resolve":
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	972 for (opt, c_option) in conflict_opts:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	973 if opt.startswith("--"):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	974 c_option._long_opts.remove(opt)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	975 del self._long_opt[opt]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	976 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	977 c_option._short_opts.remove(opt)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	978 del self._short_opt[opt]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	979 if not (c_option._short_opts or c_option._long_opts):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	980 c_option.container.option_list.remove(c_option)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	981
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	982 def add_option(self, args, *kwargs):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	983 """add_option(Option)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	984 add_option(opt_str, ..., kwarg=val, ...)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	985 """
43577 ace45b361e87 Patch# 1258 by Christian Heimes: kill basestring. Guido van Rossum <guido@python.org> parents: 43020 diff changeset	986 if isinstance(args[0], str):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	987 option = self.option_class(args, *kwargs)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	988 elif len(args) == 1 and not kwargs:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	989 option = args[0]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	990 if not isinstance(option, Option):
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42552 diff changeset	991 raise TypeError("not an Option instance: %r" % option)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	992 else:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42552 diff changeset	993 raise TypeError("invalid arguments")
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	994
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	995 self._check_conflict(option)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	996
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	997 self.option_list.append(option)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	998 option.container = self
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	999 for opt in option._short_opts:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1000 self._short_opt[opt] = option
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1001 for opt in option._long_opts:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1002 self._long_opt[opt] = option
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1003
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1004 if option.dest is not None: # option has a dest, we need a default
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1005 if option.default is not NO_DEFAULT:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1006 self.defaults[option.dest] = option.default
39575 63237fcefd99 Get rid of dict.has_key(). Boy this has a lot of repercussions! Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1007 elif option.dest not in self.defaults:
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1008 self.defaults[option.dest] = None
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1009
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1010 return option
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1011
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1012 def add_options(self, option_list):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1013 for option in option_list:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1014 self.add_option(option)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1015
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1016 # -- Option query/removal methods ----------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1017
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1018 def get_option(self, opt_str):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1019 return (self._short_opt.get(opt_str) or
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1020 self._long_opt.get(opt_str))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1021
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1022 def has_option(self, opt_str):
39575 63237fcefd99 Get rid of dict.has_key(). Boy this has a lot of repercussions! Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1023 return (opt_str in self._short_opt or
39589 d240ce5696f9 More has_key() fixes. Guido van Rossum <guido@python.org> parents: 39575 diff changeset	1024 opt_str in self._long_opt)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1025
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1026 def remove_option(self, opt_str):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1027 option = self._short_opt.get(opt_str)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1028 if option is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1029 option = self._long_opt.get(opt_str)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1030 if option is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1031 raise ValueError("no such option %r" % opt_str)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1032
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1033 for opt in option._short_opts:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1034 del self._short_opt[opt]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1035 for opt in option._long_opts:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1036 del self._long_opt[opt]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1037 option.container.option_list.remove(option)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1038
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1039
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1040 # -- Help-formatting methods ---------------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1041
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1042 def format_option_help(self, formatter):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1043 if not self.option_list:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1044 return ""
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1045 result = []
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1046 for option in self.option_list:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1047 if not option.help is SUPPRESS_HELP:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1048 result.append(formatter.format_option(option))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1049 return "".join(result)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1050
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1051 def format_description(self, formatter):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1052 return formatter.format_description(self.get_description())
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1053
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1054 def format_help(self, formatter):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1055 result = []
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1056 if self.description:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1057 result.append(self.format_description(formatter))
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1058 if self.option_list:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1059 result.append(self.format_option_help(formatter))
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1060 return "\n".join(result)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1061
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1062
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1063 class OptionGroup (OptionContainer):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1064
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1065 def __init__(self, parser, title, description=None):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1066 self.parser = parser
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1067 OptionContainer.__init__(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1068 self, parser.option_class, parser.conflict_handler, description)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1069 self.title = title
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1070
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1071 def _create_option_list(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1072 self.option_list = []
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1073 self._share_option_mappings(self.parser)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1074
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1075 def set_title(self, title):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1076 self.title = title
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1077
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1078 def destroy(self):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1079 """see OptionParser.destroy()."""
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1080 OptionContainer.destroy(self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1081 del self.option_list
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1082
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1083 # -- Help-formatting methods ---------------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1084
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1085 def format_help(self, formatter):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1086 result = formatter.format_heading(self.title)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1087 formatter.indent()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1088 result += OptionContainer.format_help(self, formatter)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1089 formatter.dedent()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1090 return result
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1091
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1092
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1093 class OptionParser (OptionContainer):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1094
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1095 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1096 Class attributes:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1097 standard_option_list : [Option]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1098 list of standard options that will be accepted by all instances
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1099 of this parser class (intended to be overridden by subclasses).
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1100
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1101 Instance attributes:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1102 usage : string
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1103 a usage string for your program. Before it is displayed
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1104 to the user, "%prog" will be expanded to the name of
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	1105 your program (self.prog or os.path.basename(sys.argv[0])).
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	1106 prog : string
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	1107 the name of the current program (to override
be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	1108 os.path.basename(sys.argv[0])).
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1109 epilog : string
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1110 paragraph of help text to print after option help
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1111
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1112 option_groups : [OptionGroup]
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1113 list of option groups in this parser (option groups are
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1114 irrelevant for parsing the command-line, but very useful
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1115 for generating help)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1116
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1117 allow_interspersed_args : bool = true
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1118 if true, positional arguments may be interspersed with options.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1119 Assuming -a and -b each take a single argument, the command-line
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1120 -ablah foo bar -bboo baz
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1121 will be interpreted the same as
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1122 -ablah -bboo -- foo bar baz
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1123 If this flag were false, that command line would be interpreted as
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1124 -ablah -- foo bar -bboo baz
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1125 -- ie. we stop processing options as soon as we see the first
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1126 non-option argument. (This is the tradition followed by
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1127 Python's getopt module, Perl's Getopt::Std, and other argument-
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1128 parsing libraries, but it is generally annoying to users.)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1129
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1130 process_default_values : bool = true
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1131 if true, option default values are processed similarly to option
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1132 values from the command line: that is, they are passed to the
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1133 type-checking function for the option's type (as long as the
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1134 default value is a string). (This really only matters if you
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1135 have defined custom types; see SF bug #955889.) Set it to false
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1136 to restore the behaviour of Optik 1.4.1 and earlier.
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1137
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1138 rargs : [string]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1139 the argument list currently being parsed. Only set when
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1140 parse_args() is active, and continually trimmed down as
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1141 we consume arguments. Mainly there for the benefit of
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1142 callback options.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1143 largs : [string]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1144 the list of leftover arguments that we have skipped while
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1145 parsing options. If allow_interspersed_args is false, this
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1146 list is always empty.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1147 values : Values
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1148 the set of option values currently being accumulated. Only
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1149 set when parse_args() is active. Also mainly for callbacks.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1150
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1151 Because of the 'rargs', 'largs', and 'values' attributes,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1152 OptionParser is not thread-safe. If, for some perverse reason, you
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1153 need to parse command-line arguments simultaneously in different
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1154 threads, use different OptionParser instances.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1155
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1156 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1157
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1158 standard_option_list = []
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1159
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1160 def __init__(self,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1161 usage=None,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1162 option_list=None,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1163 option_class=Option,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1164 version=None,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1165 conflict_handler="error",
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1166 description=None,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1167 formatter=None,
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1168 add_help_option=True,
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1169 prog=None,
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1170 epilog=None):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1171 OptionContainer.__init__(
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1172 self, option_class, conflict_handler, description)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1173 self.set_usage(usage)
28705 be14970a9955 Update to Optik 1.4.1; here are the relevant bits of the change log: Greg Ward <gward@python.net> parents: 27091 diff changeset	1174 self.prog = prog
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1175 self.version = version
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1176 self.allow_interspersed_args = True
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1177 self.process_default_values = True
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1178 if formatter is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1179 formatter = IndentedHelpFormatter()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1180 self.formatter = formatter
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1181 self.formatter.set_parser(self)
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1182 self.epilog = epilog
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1183
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1184 # Populate the option list; initial sources are the
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1185 # standard_option_list class attribute, the 'option_list'
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1186 # argument, and (if applicable) the _add_version_option() and
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1187 # _add_help_option() methods.
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1188 self._populate_option_list(option_list,
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1189 add_help=add_help_option)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1190
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1191 self._init_parsing_state()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1192
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1193
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1194 def destroy(self):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1195 """
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1196 Declare that you are done with this OptionParser. This cleans up
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1197 reference cycles so the OptionParser (and all objects referenced by
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1198 it) can be garbage-collected promptly. After calling destroy(), the
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1199 OptionParser is unusable.
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1200 """
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1201 OptionContainer.destroy(self)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1202 for group in self.option_groups:
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1203 group.destroy()
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1204 del self.option_list
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1205 del self.option_groups
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1206 del self.formatter
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1207
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1208
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1209 # -- Private methods -----------------------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1210 # (used by our or OptionContainer's constructor)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1211
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1212 def _create_option_list(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1213 self.option_list = []
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1214 self.option_groups = []
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1215 self._create_option_mappings()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1216
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1217 def _add_help_option(self):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1218 self.add_option("-h", "--help",
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1219 action="help",
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1220 help=_("show this help message and exit"))
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1221
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1222 def _add_version_option(self):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1223 self.add_option("--version",
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1224 action="version",
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1225 help=_("show program's version number and exit"))
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1226
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1227 def _populate_option_list(self, option_list, add_help=True):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1228 if self.standard_option_list:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1229 self.add_options(self.standard_option_list)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1230 if option_list:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1231 self.add_options(option_list)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1232 if self.version:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1233 self._add_version_option()
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1234 if add_help:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1235 self._add_help_option()
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1236
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1237 def _init_parsing_state(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1238 # These are set in parse_args() for the convenience of callbacks.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1239 self.rargs = None
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1240 self.largs = None
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1241 self.values = None
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1242
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1243
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1244 # -- Simple modifier methods ---------------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1245
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1246 def set_usage(self, usage):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1247 if usage is None:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1248 self.usage = _("%prog [options]")
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1249 elif usage is SUPPRESS_USAGE:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1250 self.usage = None
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1251 # For backwards compatibility with Optik 1.3 and earlier.
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1252 elif usage.lower().startswith("usage: "):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1253 self.usage = usage[7:]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1254 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1255 self.usage = usage
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1256
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1257 def enable_interspersed_args(self):
49493 bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	1258 """Set parsing to not stop on the first non-option, allowing
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	1259 interspersing switches with command arguments. This is the
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	1260 default behavior. See also disable_interspersed_args() and the
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	1261 class documentation description of the attribute
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	1262 allow_interspersed_args."""
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1263 self.allow_interspersed_args = True
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1264
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1265 def disable_interspersed_args(self):
49493 bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	1266 """Set parsing to stop on the first non-option. Use this if
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	1267 you have a command processor which runs another command that
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	1268 has options of its own and you want to make sure these options
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	1269 don't get confused.
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 44098 diff changeset	1270 """
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1271 self.allow_interspersed_args = False
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1272
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1273 def set_process_default_values(self, process):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1274 self.process_default_values = process
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1275
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1276 def set_default(self, dest, value):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1277 self.defaults[dest] = value
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1278
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1279 def set_defaults(self, **kwargs):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1280 self.defaults.update(kwargs)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1281
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1282 def _get_all_options(self):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1283 options = self.option_list[:]
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1284 for group in self.option_groups:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1285 options.extend(group.option_list)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1286 return options
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1287
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1288 def get_default_values(self):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1289 if not self.process_default_values:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1290 # Old, pre-Optik 1.5 behaviour.
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1291 return Values(self.defaults)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1292
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1293 defaults = self.defaults.copy()
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1294 for option in self._get_all_options():
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1295 default = defaults.get(option.dest)
43577 ace45b361e87 Patch# 1258 by Christian Heimes: kill basestring. Guido van Rossum <guido@python.org> parents: 43020 diff changeset	1296 if isinstance(default, str):
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1297 opt_str = option.get_opt_string()
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1298 defaults[option.dest] = option.check_value(opt_str, default)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1299
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1300 return Values(defaults)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1301
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1302
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1303 # -- OptionGroup methods -------------------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1304
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1305 def add_option_group(self, args, *kwargs):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1306 # XXX lots of overlap with OptionContainer.add_option()
43577 ace45b361e87 Patch# 1258 by Christian Heimes: kill basestring. Guido van Rossum <guido@python.org> parents: 43020 diff changeset	1307 if isinstance(args[0], str):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1308 group = OptionGroup(self, args, *kwargs)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1309 elif len(args) == 1 and not kwargs:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1310 group = args[0]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1311 if not isinstance(group, OptionGroup):
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42552 diff changeset	1312 raise TypeError("not an OptionGroup instance: %r" % group)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1313 if group.parser is not self:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42552 diff changeset	1314 raise ValueError("invalid OptionGroup (wrong parser)")
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1315 else:
43020 907a45df1295 Raise statement normalization in Lib/. Collin Winter <collinw@gmail.com> parents: 42552 diff changeset	1316 raise TypeError("invalid arguments")
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1317
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1318 self.option_groups.append(group)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1319 return group
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1320
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1321 def get_option_group(self, opt_str):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1322 option = (self._short_opt.get(opt_str) or
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1323 self._long_opt.get(opt_str))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1324 if option and option.container is not self:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1325 return option.container
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1326 return None
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1327
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1328
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1329 # -- Option-parsing methods ----------------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1330
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1331 def _get_args(self, args):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1332 if args is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1333 return sys.argv[1:]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1334 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1335 return args[:] # don't modify caller's list
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1336
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1337 def parse_args(self, args=None, values=None):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1338 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1339 parse_args(args : [string] = sys.argv[1:],
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1340 values : Values = None)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1341 -> (values : Values, args : [string])
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1342
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1343 Parse the command-line options found in 'args' (default:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1344 sys.argv[1:]). Any errors result in a call to 'error()', which
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1345 by default prints the usage message to stderr and calls
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1346 sys.exit() with an error message. On success returns a pair
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1347 (values, args) where 'values' is an Values instance (with all
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1348 your option values) and 'args' is the list of arguments left
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1349 over after parsing options.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1350 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1351 rargs = self._get_args(args)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1352 if values is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1353 values = self.get_default_values()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1354
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1355 # Store the halves of the argument list as attributes for the
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1356 # convenience of callbacks:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1357 # rargs
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1358 # the rest of the command-line (the "r" stands for
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1359 # "remaining" or "right-hand")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1360 # largs
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1361 # the leftover arguments -- ie. what's left after removing
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1362 # options and their arguments (the "l" stands for "leftover"
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1363 # or "left-hand")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1364 self.rargs = rargs
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1365 self.largs = largs = []
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1366 self.values = values
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1367
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1368 try:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1369 stop = self._process_args(largs, rargs, values)
40587 6b18a095c2e7 SF patch 1631942 by Collin Winter: Guido van Rossum <guido@python.org> parents: 39644 diff changeset	1370 except (BadOptionError, OptionValueError) as err:
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1371 self.error(str(err))
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1372
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1373 args = largs + rargs
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1374 return self.check_values(values, args)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1375
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1376 def check_values(self, values, args):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1377 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1378 check_values(values : Values, args : [string])
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1379 -> (values : Values, args : [string])
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1380
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1381 Check that the supplied option values and leftover arguments are
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1382 valid. Returns the option values and leftover arguments
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1383 (possibly adjusted, possibly completely new -- whatever you
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1384 like). Default implementation just returns the passed-in
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1385 values; subclasses may override as desired.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1386 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1387 return (values, args)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1388
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1389 def _process_args(self, largs, rargs, values):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1390 """_process_args(largs : [string],
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1391 rargs : [string],
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1392 values : Values)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1393
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1394 Process command-line arguments and populate 'values', consuming
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1395 options and arguments from 'rargs'. If 'allow_interspersed_args' is
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1396 false, stop at the first non-option argument. If true, accumulate any
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1397 interspersed non-option arguments in 'largs'.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1398 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1399 while rargs:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1400 arg = rargs[0]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1401 # We handle bare "--" explicitly, and bare "-" is handled by the
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1402 # standard arg handler since the short arg case ensures that the
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1403 # len of the opt string is greater than 1.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1404 if arg == "--":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1405 del rargs[0]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1406 return
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1407 elif arg[0:2] == "--":
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1408 # process a single long option (possibly with value(s))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1409 self._process_long_opt(rargs, values)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1410 elif arg[:1] == "-" and len(arg) > 1:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1411 # process a cluster of short options (possibly with
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1412 # value(s) for the last one only)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1413 self._process_short_opts(rargs, values)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1414 elif self.allow_interspersed_args:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1415 largs.append(arg)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1416 del rargs[0]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1417 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1418 return # stop now, leave this arg in rargs
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1419
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1420 # Say this is the original argument list:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1421 # [arg0, arg1, ..., arg(i-1), arg(i), arg(i+1), ..., arg(N-1)]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1422 # ^
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1423 # (we are about to process arg(i)).
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1424 #
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1425 # Then rargs is [arg(i), ..., arg(N-1)] and largs is a subset of
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1426 # [arg0, ..., arg(i-1)] (any options and their arguments will have
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1427 # been removed from largs).
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1428 #
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1429 # The while loop will usually consume 1 or more arguments per pass.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1430 # If it consumes 1 (eg. arg is an option that takes no arguments),
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1431 # then after _process_arg() is done the situation is:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1432 #
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1433 # largs = subset of [arg0, ..., arg(i)]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1434 # rargs = [arg(i+1), ..., arg(N-1)]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1435 #
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1436 # If allow_interspersed_args is false, largs will always be
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1437 # empty -- still a subset of [arg0, ..., arg(i-1)], but
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1438 # not a very interesting subset!
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1439
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1440 def _match_long_opt(self, opt):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1441 """_match_long_opt(opt : string) -> string
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1442
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1443 Determine which long option string 'opt' matches, ie. which one
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1444 it is an unambiguous abbrevation for. Raises BadOptionError if
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1445 'opt' doesn't unambiguously match any long option string.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1446 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1447 return _match_abbrev(opt, self._long_opt)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1448
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1449 def _process_long_opt(self, rargs, values):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1450 arg = rargs.pop(0)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1451
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1452 # Value explicitly attached to arg? Pretend it's the next
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1453 # argument.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1454 if "=" in arg:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1455 (opt, next_arg) = arg.split("=", 1)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1456 rargs.insert(0, next_arg)
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1457 had_explicit_value = True
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1458 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1459 opt = arg
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1460 had_explicit_value = False
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1461
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1462 opt = self._match_long_opt(opt)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1463 option = self._long_opt[opt]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1464 if option.takes_value():
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1465 nargs = option.nargs
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1466 if len(rargs) < nargs:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1467 if nargs == 1:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1468 self.error(_("%s option requires an argument") % opt)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1469 else:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1470 self.error(_("%s option requires %d arguments")
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1471 % (opt, nargs))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1472 elif nargs == 1:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1473 value = rargs.pop(0)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1474 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1475 value = tuple(rargs[0:nargs])
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1476 del rargs[0:nargs]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1477
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1478 elif had_explicit_value:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1479 self.error(_("%s option does not take a value") % opt)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1480
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1481 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1482 value = None
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1483
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1484 option.process(opt, value, values, self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1485
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1486 def _process_short_opts(self, rargs, values):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1487 arg = rargs.pop(0)
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1488 stop = False
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1489 i = 1
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1490 for ch in arg[1:]:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1491 opt = "-" + ch
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1492 option = self._short_opt.get(opt)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1493 i += 1 # we have consumed a character
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1494
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1495 if not option:
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1496 raise BadOptionError(opt)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1497 if option.takes_value():
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1498 # Any characters left in arg? Pretend they're the
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1499 # next arg, and stop consuming characters of arg.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1500 if i < len(arg):
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1501 rargs.insert(0, arg[i:])
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1502 stop = True
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1503
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1504 nargs = option.nargs
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1505 if len(rargs) < nargs:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1506 if nargs == 1:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1507 self.error(_("%s option requires an argument") % opt)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1508 else:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1509 self.error(_("%s option requires %d arguments")
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1510 % (opt, nargs))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1511 elif nargs == 1:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1512 value = rargs.pop(0)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1513 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1514 value = tuple(rargs[0:nargs])
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1515 del rargs[0:nargs]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1516
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1517 else: # option doesn't take a value
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1518 value = None
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1519
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1520 option.process(opt, value, values, self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1521
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1522 if stop:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1523 break
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1524
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1525
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1526 # -- Feedback methods ----------------------------------------------
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1527
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1528 def get_prog_name(self):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1529 if self.prog is None:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1530 return os.path.basename(sys.argv[0])
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1531 else:
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1532 return self.prog
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1533
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1534 def expand_prog_name(self, s):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1535 return s.replace("%prog", self.get_prog_name())
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1536
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1537 def get_description(self):
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1538 return self.expand_prog_name(self.description)
195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1539
33846 79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	1540 def exit(self, status=0, msg=None):
79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	1541 if msg:
79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	1542 sys.stderr.write(msg)
79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	1543 sys.exit(status)
79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	1544
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1545 def error(self, msg):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1546 """error(msg : string)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1547
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1548 Print a usage message incorporating 'msg' to stderr and exit.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1549 If you override this in a subclass, it should not return -- it
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1550 should either exit or raise an exception.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1551 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1552 self.print_usage(sys.stderr)
33846 79bcad14e96a Update optparse module and test suite to Optik 1.5a2. Greg Ward <gward@python.net> parents: 33772 diff changeset	1553 self.exit(2, "%s: error: %s\n" % (self.get_prog_name(), msg))
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1554
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1555 def get_usage(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1556 if self.usage:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1557 return self.formatter.format_usage(
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1558 self.expand_prog_name(self.usage))
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1559 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1560 return ""
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1561
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1562 def print_usage(self, file=None):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1563 """print_usage(file : file = stdout)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1564
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1565 Print the usage message for the current program (self.usage) to
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1566 'file' (default stdout). Any occurence of the string "%prog" in
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1567 self.usage is replaced with the name of the current program
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1568 (basename of sys.argv[0]). Does nothing if self.usage is empty
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1569 or not defined.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1570 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1571 if self.usage:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1572 print(self.get_usage(), file=file)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1573
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1574 def get_version(self):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1575 if self.version:
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1576 return self.expand_prog_name(self.version)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1577 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1578 return ""
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1579
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1580 def print_version(self, file=None):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1581 """print_version(file : file = stdout)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1582
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1583 Print the version message for this program (self.version) to
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1584 'file' (default stdout). As with print_usage(), any occurence
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1585 of "%prog" in self.version is replaced by the current program's
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1586 name. Does nothing if self.version is empty or undefined.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1587 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1588 if self.version:
40775 4cdf21a0dbbc Fix most trivially-findable print statements. Guido van Rossum <guido@python.org> parents: 40644 diff changeset	1589 print(self.get_version(), file=file)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1590
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1591 def format_option_help(self, formatter=None):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1592 if formatter is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1593 formatter = self.formatter
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1594 formatter.store_option_strings(self)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1595 result = []
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1596 result.append(formatter.format_heading(_("Options")))
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1597 formatter.indent()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1598 if self.option_list:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1599 result.append(OptionContainer.format_option_help(self, formatter))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1600 result.append("\n")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1601 for group in self.option_groups:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1602 result.append(group.format_help(formatter))
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1603 result.append("\n")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1604 formatter.dedent()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1605 # Drop the last "\n", or the header if no options or option groups:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1606 return "".join(result[:-1])
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1607
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1608 def format_epilog(self, formatter):
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1609 return formatter.format_epilog(self.epilog)
29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1610
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1611 def format_help(self, formatter=None):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1612 if formatter is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1613 formatter = self.formatter
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1614 result = []
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1615 if self.usage:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1616 result.append(self.get_usage() + "\n")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1617 if self.description:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1618 result.append(self.format_description(formatter) + "\n")
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1619 result.append(self.format_option_help(formatter))
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1620 result.append(self.format_epilog(formatter))
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1621 return "".join(result)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1622
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1623 def print_help(self, file=None):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1624 """print_help(file : file = stdout)
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1625
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1626 Print an extended help message, listing all options and any
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1627 help text provided with them, to 'file' (default stdout).
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1628 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1629 if file is None:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1630 file = sys.stdout
42501 f6069f9dd52d SF patch# 1770008 by Christian Heimes (plus some extras). Guido van Rossum <guido@python.org> parents: 42142 diff changeset	1631 file.write(self.format_help())
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1632
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1633 # class OptionParser
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1634
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1635
32870 195655299ed3 Upgrade optparse module and tests to Optik 1.5a1: Greg Ward <gward@python.net> parents: 31858 diff changeset	1636 def _match_abbrev(s, wordmap):
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1637 """_match_abbrev(s : string, wordmap : {string : Option}) -> string
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1638
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1639 Return the string key in 'wordmap' for which 's' is an unambiguous
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1640 abbreviation. If 's' is found to be ambiguous or doesn't match any of
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1641 'words', raise BadOptionError.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1642 """
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1643 # Is there an exact match?
39575 63237fcefd99 Get rid of dict.has_key(). Boy this has a lot of repercussions! Guido van Rossum <guido@python.org> parents: 39442 diff changeset	1644 if s in wordmap:
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1645 return s
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1646 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1647 # Isolate all words with s as a prefix.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1648 possibilities = [word for word in wordmap.keys()
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1649 if word.startswith(s)]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1650 # No exact match, so there had better be just one possibility.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1651 if len(possibilities) == 1:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1652 return possibilities[0]
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1653 elif not possibilities:
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1654 raise BadOptionError(s)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1655 else:
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1656 # More than one possible completion: ambiguous prefix.
38669 19fd6141940d Partially merge trunk into p3yk. The removal of Mac/Tools is confusing svn Thomas Wouters <thomas@python.org> parents: 38453 diff changeset	1657 possibilities.sort()
38453 29ae5e0fc348 Much-needed merge (using svnmerge.py this time) of trunk changes into p3yk. Thomas Wouters <thomas@python.org> parents: 34551 diff changeset	1658 raise AmbiguousOptionError(s, possibilities)
26224 adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1659
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1660
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1661 # Some day, there might be many Option classes. As of Optik 1.3, the
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1662 # preferred way to instantiate Options is indirectly, via make_option(),
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1663 # which will become a factory function when there are many Option
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1664 # classes.
adb93f4e9780 Checking in Greg Ward's Optik, as optparse.py. This is the most Guido van Rossum <guido@python.org> parents: diff changeset	1665 make_option = Option

Mercurial > cpython-lru_cache-weakref

annotate Lib/optparse.py @ 49961:e793fc3c8abe