mirror of
https://github.com/python/cpython.git
synced 2026-02-27 09:31:19 +00:00
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
636 lines
16 KiB
Python
636 lines
16 KiB
Python
""" CommandLine - Get and parse command line options
|
|
|
|
NOTE: This still is very much work in progress !!!
|
|
|
|
Different version are likely to be incompatible.
|
|
|
|
TODO:
|
|
|
|
* Incorporate the changes made by (see Inbox)
|
|
* Add number range option using srange()
|
|
|
|
"""
|
|
|
|
__copyright__ = """\
|
|
Copyright (c), 1997-2006, Marc-Andre Lemburg (mal@lemburg.com)
|
|
Copyright (c), 2000-2006, eGenix.com Software GmbH (info@egenix.com)
|
|
See the documentation for further information on copyrights,
|
|
or contact the author. All Rights Reserved.
|
|
"""
|
|
|
|
__version__ = '1.2'
|
|
|
|
import sys, getopt, string, glob, os, re, exceptions, traceback
|
|
|
|
### Helpers
|
|
|
|
def _getopt_flags(options):
|
|
|
|
""" Convert the option list to a getopt flag string and long opt
|
|
list
|
|
|
|
"""
|
|
s = []
|
|
l = []
|
|
for o in options:
|
|
if o.prefix == '-':
|
|
# short option
|
|
s.append(o.name)
|
|
if o.takes_argument:
|
|
s.append(':')
|
|
else:
|
|
# long option
|
|
if o.takes_argument:
|
|
l.append(o.name+'=')
|
|
else:
|
|
l.append(o.name)
|
|
return string.join(s,''),l
|
|
|
|
def invisible_input(prompt='>>> '):
|
|
|
|
""" Get raw input from a terminal without echoing the characters to
|
|
the terminal, e.g. for password queries.
|
|
|
|
"""
|
|
import getpass
|
|
entry = getpass.getpass(prompt)
|
|
if entry is None:
|
|
raise KeyboardInterrupt
|
|
return entry
|
|
|
|
def fileopen(name, mode='wb', encoding=None):
|
|
|
|
""" Open a file using mode.
|
|
|
|
Default mode is 'wb' meaning to open the file for writing in
|
|
binary mode. If encoding is given, I/O to and from the file is
|
|
transparently encoded using the given encoding.
|
|
|
|
Files opened for writing are chmod()ed to 0600.
|
|
|
|
"""
|
|
if name == 'stdout':
|
|
return sys.stdout
|
|
elif name == 'stderr':
|
|
return sys.stderr
|
|
elif name == 'stdin':
|
|
return sys.stdin
|
|
else:
|
|
if encoding is not None:
|
|
import codecs
|
|
f = codecs.open(name, mode, encoding)
|
|
else:
|
|
f = open(name, mode)
|
|
if 'w' in mode:
|
|
os.chmod(name, 0o600)
|
|
return f
|
|
|
|
def option_dict(options):
|
|
|
|
""" Return a dictionary mapping option names to Option instances.
|
|
"""
|
|
d = {}
|
|
for option in options:
|
|
d[option.name] = option
|
|
return d
|
|
|
|
# Alias
|
|
getpasswd = invisible_input
|
|
|
|
_integerRE = re.compile('\s*(-?\d+)\s*$')
|
|
_integerRangeRE = re.compile('\s*(-?\d+)\s*-\s*(-?\d+)\s*$')
|
|
|
|
def srange(s,
|
|
|
|
split=string.split,integer=_integerRE,
|
|
integerRange=_integerRangeRE):
|
|
|
|
""" Converts a textual representation of integer numbers and ranges
|
|
to a Python list.
|
|
|
|
Supported formats: 2,3,4,2-10,-1 - -3, 5 - -2
|
|
|
|
Values are appended to the created list in the order specified
|
|
in the string.
|
|
|
|
"""
|
|
l = []
|
|
append = l.append
|
|
for entry in split(s,','):
|
|
m = integer.match(entry)
|
|
if m:
|
|
append(int(m.groups()[0]))
|
|
continue
|
|
m = integerRange.match(entry)
|
|
if m:
|
|
start,end = map(int,m.groups())
|
|
l[len(l):] = range(start,end+1)
|
|
return l
|
|
|
|
def abspath(path,
|
|
|
|
expandvars=os.path.expandvars,expanduser=os.path.expanduser,
|
|
join=os.path.join,getcwd=os.getcwd):
|
|
|
|
""" Return the corresponding absolute path for path.
|
|
|
|
path is expanded in the usual shell ways before
|
|
joining it with the current working directory.
|
|
|
|
"""
|
|
try:
|
|
path = expandvars(path)
|
|
except AttributeError:
|
|
pass
|
|
try:
|
|
path = expanduser(path)
|
|
except AttributeError:
|
|
pass
|
|
return join(getcwd(), path)
|
|
|
|
### Option classes
|
|
|
|
class Option:
|
|
|
|
""" Option base class. Takes no argument.
|
|
|
|
"""
|
|
default = None
|
|
helptext = ''
|
|
prefix = '-'
|
|
takes_argument = 0
|
|
has_default = 0
|
|
tab = 15
|
|
|
|
def __init__(self,name,help=None):
|
|
|
|
if not name[:1] == '-':
|
|
raise TypeError('option names must start with "-"')
|
|
if name[1:2] == '-':
|
|
self.prefix = '--'
|
|
self.name = name[2:]
|
|
else:
|
|
self.name = name[1:]
|
|
if help:
|
|
self.help = help
|
|
|
|
def __str__(self):
|
|
|
|
o = self
|
|
name = o.prefix + o.name
|
|
if o.takes_argument:
|
|
name = name + ' arg'
|
|
if len(name) > self.tab:
|
|
name = name + '\n' + ' ' * (self.tab + 1 + len(o.prefix))
|
|
else:
|
|
name = '%-*s ' % (self.tab, name)
|
|
description = o.help
|
|
if o.has_default:
|
|
description = description + ' (%s)' % o.default
|
|
return '%s %s' % (name, description)
|
|
|
|
class ArgumentOption(Option):
|
|
|
|
""" Option that takes an argument.
|
|
|
|
An optional default argument can be given.
|
|
|
|
"""
|
|
def __init__(self,name,help=None,default=None):
|
|
|
|
# Basemethod
|
|
Option.__init__(self,name,help)
|
|
|
|
if default is not None:
|
|
self.default = default
|
|
self.has_default = 1
|
|
self.takes_argument = 1
|
|
|
|
class SwitchOption(Option):
|
|
|
|
""" Options that can be on or off. Has an optional default value.
|
|
|
|
"""
|
|
def __init__(self,name,help=None,default=None):
|
|
|
|
# Basemethod
|
|
Option.__init__(self,name,help)
|
|
|
|
if default is not None:
|
|
self.default = default
|
|
self.has_default = 1
|
|
|
|
### Application baseclass
|
|
|
|
class Application:
|
|
|
|
""" Command line application interface with builtin argument
|
|
parsing.
|
|
|
|
"""
|
|
# Options the program accepts (Option instances)
|
|
options = []
|
|
|
|
# Standard settings; these are appended to options in __init__
|
|
preset_options = [SwitchOption('-v',
|
|
'generate verbose output'),
|
|
SwitchOption('-h',
|
|
'show this help text'),
|
|
SwitchOption('--help',
|
|
'show this help text'),
|
|
SwitchOption('--debug',
|
|
'enable debugging'),
|
|
SwitchOption('--copyright',
|
|
'show copyright'),
|
|
SwitchOption('--examples',
|
|
'show examples of usage')]
|
|
|
|
# The help layout looks like this:
|
|
# [header] - defaults to ''
|
|
#
|
|
# [synopsis] - formatted as '<self.name> %s' % self.synopsis
|
|
#
|
|
# options:
|
|
# [options] - formatted from self.options
|
|
#
|
|
# [version] - formatted as 'Version:\n %s' % self.version, if given
|
|
#
|
|
# [about] - defaults to ''
|
|
#
|
|
# Note: all fields that do not behave as template are formatted
|
|
# using the instances dictionary as substitution namespace,
|
|
# e.g. %(name)s will be replaced by the applications name.
|
|
#
|
|
|
|
# Header (default to program name)
|
|
header = ''
|
|
|
|
# Name (defaults to program name)
|
|
name = ''
|
|
|
|
# Synopsis (%(name)s is replaced by the program name)
|
|
synopsis = '%(name)s [option] files...'
|
|
|
|
# Version (optional)
|
|
version = ''
|
|
|
|
# General information printed after the possible options (optional)
|
|
about = ''
|
|
|
|
# Examples of usage to show when the --examples option is given (optional)
|
|
examples = ''
|
|
|
|
# Copyright to show
|
|
copyright = __copyright__
|
|
|
|
# Apply file globbing ?
|
|
globbing = 1
|
|
|
|
# Generate debug output ?
|
|
debug = 0
|
|
|
|
# Generate verbose output ?
|
|
verbose = 0
|
|
|
|
# Internal errors to catch
|
|
InternalError = exceptions.Exception
|
|
|
|
# Instance variables:
|
|
values = None # Dictionary of passed options (or default values)
|
|
# indexed by the options name, e.g. '-h'
|
|
files = None # List of passed filenames
|
|
optionlist = None # List of passed options
|
|
|
|
def __init__(self,argv=None):
|
|
|
|
# Setup application specs
|
|
if argv is None:
|
|
argv = sys.argv
|
|
self.filename = os.path.split(argv[0])[1]
|
|
if not self.name:
|
|
self.name = os.path.split(self.filename)[1]
|
|
else:
|
|
self.name = self.name
|
|
if not self.header:
|
|
self.header = self.name
|
|
else:
|
|
self.header = self.header
|
|
|
|
# Init .arguments list
|
|
self.arguments = argv[1:]
|
|
|
|
# Setup Option mapping
|
|
self.option_map = option_dict(self.options)
|
|
|
|
# Append preset options
|
|
for option in self.preset_options:
|
|
if not option.name in self.option_map:
|
|
self.add_option(option)
|
|
|
|
# Init .files list
|
|
self.files = []
|
|
|
|
# Start Application
|
|
rc = 0
|
|
try:
|
|
# Process startup
|
|
rc = self.startup()
|
|
if rc is not None:
|
|
raise SystemExit(rc)
|
|
|
|
# Parse command line
|
|
rc = self.parse()
|
|
if rc is not None:
|
|
raise SystemExit(rc)
|
|
|
|
# Start application
|
|
rc = self.main()
|
|
if rc is None:
|
|
rc = 0
|
|
|
|
except SystemExit as rcException:
|
|
rc = rcException
|
|
pass
|
|
|
|
except KeyboardInterrupt:
|
|
print
|
|
print '* User Break'
|
|
print
|
|
rc = 1
|
|
|
|
except self.InternalError:
|
|
print
|
|
print '* Internal Error (use --debug to display the traceback)'
|
|
if self.debug:
|
|
print
|
|
traceback.print_exc(20, sys.stdout)
|
|
elif self.verbose:
|
|
print ' %s: %s' % sys.exc_info()[:2]
|
|
print
|
|
rc = 1
|
|
|
|
raise SystemExit(rc)
|
|
|
|
def add_option(self, option):
|
|
|
|
""" Add a new Option instance to the Application dynamically.
|
|
|
|
Note that this has to be done *before* .parse() is being
|
|
executed.
|
|
|
|
"""
|
|
self.options.append(option)
|
|
self.option_map[option.name] = option
|
|
|
|
def startup(self):
|
|
|
|
""" Set user defined instance variables.
|
|
|
|
If this method returns anything other than None, the
|
|
process is terminated with the return value as exit code.
|
|
|
|
"""
|
|
return None
|
|
|
|
def exit(self, rc=0):
|
|
|
|
""" Exit the program.
|
|
|
|
rc is used as exit code and passed back to the calling
|
|
program. It defaults to 0 which usually means: OK.
|
|
|
|
"""
|
|
raise SystemExit(rc)
|
|
|
|
def parse(self):
|
|
|
|
""" Parse the command line and fill in self.values and self.files.
|
|
|
|
After having parsed the options, the remaining command line
|
|
arguments are interpreted as files and passed to .handle_files()
|
|
for processing.
|
|
|
|
As final step the option handlers are called in the order
|
|
of the options given on the command line.
|
|
|
|
"""
|
|
# Parse arguments
|
|
self.values = values = {}
|
|
for o in self.options:
|
|
if o.has_default:
|
|
values[o.prefix+o.name] = o.default
|
|
else:
|
|
values[o.prefix+o.name] = 0
|
|
flags,lflags = _getopt_flags(self.options)
|
|
try:
|
|
optlist,files = getopt.getopt(self.arguments,flags,lflags)
|
|
if self.globbing:
|
|
l = []
|
|
for f in files:
|
|
gf = glob.glob(f)
|
|
if not gf:
|
|
l.append(f)
|
|
else:
|
|
l[len(l):] = gf
|
|
files = l
|
|
self.optionlist = optlist
|
|
self.files = files + self.files
|
|
except getopt.error as why:
|
|
self.help(why)
|
|
sys.exit(1)
|
|
|
|
# Call file handler
|
|
rc = self.handle_files(self.files)
|
|
if rc is not None:
|
|
sys.exit(rc)
|
|
|
|
# Call option handlers
|
|
for optionname, value in optlist:
|
|
|
|
# Try to convert value to integer
|
|
try:
|
|
value = string.atoi(value)
|
|
except ValueError:
|
|
pass
|
|
|
|
# Find handler and call it (or count the number of option
|
|
# instances on the command line)
|
|
handlername = 'handle' + string.replace(optionname, '-', '_')
|
|
try:
|
|
handler = getattr(self, handlername)
|
|
except AttributeError:
|
|
if value == '':
|
|
# count the number of occurances
|
|
if optionname in values:
|
|
values[optionname] = values[optionname] + 1
|
|
else:
|
|
values[optionname] = 1
|
|
else:
|
|
values[optionname] = value
|
|
else:
|
|
rc = handler(value)
|
|
if rc is not None:
|
|
raise SystemExit(rc)
|
|
|
|
# Apply final file check (for backward compatibility)
|
|
rc = self.check_files(self.files)
|
|
if rc is not None:
|
|
sys.exit(rc)
|
|
|
|
def check_files(self,filelist):
|
|
|
|
""" Apply some user defined checks on the files given in filelist.
|
|
|
|
This may modify filelist in place. A typical application
|
|
is checking that at least n files are given.
|
|
|
|
If this method returns anything other than None, the
|
|
process is terminated with the return value as exit code.
|
|
|
|
"""
|
|
return None
|
|
|
|
def help(self,note=''):
|
|
|
|
self.print_header()
|
|
if self.synopsis:
|
|
print 'Synopsis:'
|
|
# To remain backward compatible:
|
|
try:
|
|
synopsis = self.synopsis % self.name
|
|
except (NameError, KeyError, TypeError):
|
|
synopsis = self.synopsis % self.__dict__
|
|
print ' ' + synopsis
|
|
print
|
|
self.print_options()
|
|
if self.version:
|
|
print 'Version:'
|
|
print ' %s' % self.version
|
|
print
|
|
if self.about:
|
|
print string.strip(self.about % self.__dict__)
|
|
print
|
|
if note:
|
|
print '-'*72
|
|
print 'Note:',note
|
|
print
|
|
|
|
def notice(self,note):
|
|
|
|
print '-'*72
|
|
print 'Note:',note
|
|
print '-'*72
|
|
print
|
|
|
|
def print_header(self):
|
|
|
|
print '-'*72
|
|
print self.header % self.__dict__
|
|
print '-'*72
|
|
print
|
|
|
|
def print_options(self):
|
|
|
|
options = self.options
|
|
print 'Options and default settings:'
|
|
if not options:
|
|
print ' None'
|
|
return
|
|
long = filter(lambda x: x.prefix == '--', options)
|
|
short = filter(lambda x: x.prefix == '-', options)
|
|
items = short + long
|
|
for o in options:
|
|
print ' ',o
|
|
print
|
|
|
|
#
|
|
# Example handlers:
|
|
#
|
|
# If a handler returns anything other than None, processing stops
|
|
# and the return value is passed to sys.exit() as argument.
|
|
#
|
|
|
|
# File handler
|
|
def handle_files(self,files):
|
|
|
|
""" This may process the files list in place.
|
|
"""
|
|
return None
|
|
|
|
# Short option handler
|
|
def handle_h(self,arg):
|
|
|
|
self.help()
|
|
return 0
|
|
|
|
def handle_v(self, value):
|
|
|
|
""" Turn on verbose output.
|
|
"""
|
|
self.verbose = 1
|
|
|
|
# Handlers for long options have two underscores in their name
|
|
def handle__help(self,arg):
|
|
|
|
self.help()
|
|
return 0
|
|
|
|
def handle__debug(self,arg):
|
|
|
|
self.debug = 1
|
|
# We don't want to catch internal errors:
|
|
self.InternalError = None
|
|
|
|
def handle__copyright(self,arg):
|
|
|
|
self.print_header()
|
|
print string.strip(self.copyright % self.__dict__)
|
|
print
|
|
return 0
|
|
|
|
def handle__examples(self,arg):
|
|
|
|
self.print_header()
|
|
if self.examples:
|
|
print 'Examples:'
|
|
print
|
|
print string.strip(self.examples % self.__dict__)
|
|
print
|
|
else:
|
|
print 'No examples available.'
|
|
print
|
|
return 0
|
|
|
|
def main(self):
|
|
|
|
""" Override this method as program entry point.
|
|
|
|
The return value is passed to sys.exit() as argument. If
|
|
it is None, 0 is assumed (meaning OK). Unhandled
|
|
exceptions are reported with exit status code 1 (see
|
|
__init__ for further details).
|
|
|
|
"""
|
|
return None
|
|
|
|
# Alias
|
|
CommandLine = Application
|
|
|
|
def _test():
|
|
|
|
class MyApplication(Application):
|
|
header = 'Test Application'
|
|
version = __version__
|
|
options = [Option('-v','verbose')]
|
|
|
|
def handle_v(self,arg):
|
|
print 'VERBOSE, Yeah !'
|
|
|
|
cmd = MyApplication()
|
|
if not cmd.values['-h']:
|
|
cmd.help()
|
|
print 'files:',cmd.files
|
|
print 'Bye...'
|
|
|
|
if __name__ == '__main__':
|
|
_test()
|