Patch #495598: add an -q (quiet) option to pycompile.

This commit is contained in:
Martin v. Löwis 2002-03-18 12:44:08 +00:00
parent 73f570ba08
commit 5c137c2251
3 changed files with 31 additions and 11 deletions

View File

@ -17,14 +17,22 @@ compile Python sources in directories named on the command line or in
\begin{funcdesc}{compile_dir}{dir\optional{, maxlevels\optional{, \begin{funcdesc}{compile_dir}{dir\optional{, maxlevels\optional{,
ddir\optional{, force}}}} ddir\optional{, force\optional{,
rx\optional{, quiet}}}}}}
Recursively descend the directory tree named by \var{dir}, compiling Recursively descend the directory tree named by \var{dir}, compiling
all \file{.py} files along the way. The \var{maxlevels} parameter all \file{.py} files along the way. The \var{maxlevels} parameter
is used to limit the depth of the recursion; it defaults to is used to limit the depth of the recursion; it defaults to
\code{10}. If \var{ddir} is given, it is used as the base path from \code{10}. If \var{ddir} is given, it is used as the base path from
which the filenames used in error messages will be generated. If which the filenames used in error messages will be generated. If
\var{force} is true, modules are re-compiled even if the timestamps \var{force} is true, modules are re-compiled even if the timestamps
are up to date. are up to date.
If \var{rx} is given, it specifies a regular expression of file
names to exclude from the search; that expression is searched for in
the full path.
If \var{quiet} is true, nothing is printed to the standard output
in normal operation.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{compile_path}{\optional{skip_curdir\optional{, \begin{funcdesc}{compile_path}{\optional{skip_curdir\optional{,

View File

@ -19,7 +19,8 @@ import py_compile
__all__ = ["compile_dir","compile_path"] __all__ = ["compile_dir","compile_path"]
def compile_dir(dir, maxlevels=10, ddir=None, force=0, rx=None): def compile_dir(dir, maxlevels=10, ddir=None,
force=0, rx=None, quiet=0):
"""Byte-compile all modules in the given directory tree. """Byte-compile all modules in the given directory tree.
Arguments (only dir is required): Arguments (only dir is required):
@ -29,9 +30,11 @@ def compile_dir(dir, maxlevels=10, ddir=None, force=0, rx=None):
ddir: if given, purported directory name (this is the ddir: if given, purported directory name (this is the
directory name that will show up in error messages) directory name that will show up in error messages)
force: if 1, force compilation, even if timestamps are up-to-date force: if 1, force compilation, even if timestamps are up-to-date
quiet: if 1, be quiet during compilation
""" """
print 'Listing', dir, '...' if not quiet:
print 'Listing', dir, '...'
try: try:
names = os.listdir(dir) names = os.listdir(dir)
except os.error: except os.error:
@ -57,7 +60,8 @@ def compile_dir(dir, maxlevels=10, ddir=None, force=0, rx=None):
try: ctime = os.stat(cfile)[stat.ST_MTIME] try: ctime = os.stat(cfile)[stat.ST_MTIME]
except os.error: ctime = 0 except os.error: ctime = 0
if (ctime > ftime) and not force: continue if (ctime > ftime) and not force: continue
print 'Compiling', fullname, '...' if not quiet:
print 'Compiling', fullname, '...'
try: try:
ok = py_compile.compile(fullname, None, dfile) ok = py_compile.compile(fullname, None, dfile)
except KeyboardInterrupt: except KeyboardInterrupt:
@ -77,11 +81,11 @@ def compile_dir(dir, maxlevels=10, ddir=None, force=0, rx=None):
name != os.curdir and name != os.pardir and \ name != os.curdir and name != os.pardir and \
os.path.isdir(fullname) and \ os.path.isdir(fullname) and \
not os.path.islink(fullname): not os.path.islink(fullname):
if not compile_dir(fullname, maxlevels - 1, dfile, force, rx): if not compile_dir(fullname, maxlevels - 1, dfile, force, rx, quiet):
success = 0 success = 0
return success return success
def compile_path(skip_curdir=1, maxlevels=0, force=0): def compile_path(skip_curdir=1, maxlevels=0, force=0, quiet=0):
"""Byte-compile all module on sys.path. """Byte-compile all module on sys.path.
Arguments (all optional): Arguments (all optional):
@ -89,6 +93,7 @@ def compile_path(skip_curdir=1, maxlevels=0, force=0):
skip_curdir: if true, skip current directory (default true) skip_curdir: if true, skip current directory (default true)
maxlevels: max recursion level (default 0) maxlevels: max recursion level (default 0)
force: as for compile_dir() (default 0) force: as for compile_dir() (default 0)
quiet: as for compile_dir() (default 0)
""" """
success = 1 success = 1
@ -96,20 +101,22 @@ def compile_path(skip_curdir=1, maxlevels=0, force=0):
if (not dir or dir == os.curdir) and skip_curdir: if (not dir or dir == os.curdir) and skip_curdir:
print 'Skipping current directory' print 'Skipping current directory'
else: else:
success = success and compile_dir(dir, maxlevels, None, force) success = success and compile_dir(dir, maxlevels, None,
force, quiet=quiet)
return success return success
def main(): def main():
"""Script main program.""" """Script main program."""
import getopt import getopt
try: try:
opts, args = getopt.getopt(sys.argv[1:], 'lfd:x:') opts, args = getopt.getopt(sys.argv[1:], 'lfqd:x:')
except getopt.error, msg: except getopt.error, msg:
print msg print msg
print "usage: python compileall.py [-l] [-f] [-d destdir] " \ print "usage: python compileall.py [-l] [-f] [-q] [-d destdir] " \
"[-s regexp] [directory ...]" "[-s regexp] [directory ...]"
print "-l: don't recurse down" print "-l: don't recurse down"
print "-f: force rebuild even if timestamps are up-to-date" print "-f: force rebuild even if timestamps are up-to-date"
print "-q: quiet operation"
print "-d destdir: purported directory name for error messages" print "-d destdir: purported directory name for error messages"
print " if no directory arguments, -l sys.path is assumed" print " if no directory arguments, -l sys.path is assumed"
print "-x regexp: skip files matching the regular expression regexp" print "-x regexp: skip files matching the regular expression regexp"
@ -118,11 +125,13 @@ def main():
maxlevels = 10 maxlevels = 10
ddir = None ddir = None
force = 0 force = 0
quiet = 0
rx = None rx = None
for o, a in opts: for o, a in opts:
if o == '-l': maxlevels = 0 if o == '-l': maxlevels = 0
if o == '-d': ddir = a if o == '-d': ddir = a
if o == '-f': force = 1 if o == '-f': force = 1
if o == '-q': quiet = 1
if o == '-x': if o == '-x':
import re import re
rx = re.compile(a) rx = re.compile(a)
@ -134,7 +143,8 @@ def main():
try: try:
if args: if args:
for dir in args: for dir in args:
if not compile_dir(dir, maxlevels, ddir, force, rx): if not compile_dir(dir, maxlevels, ddir,
force, rx, quiet):
success = 0 success = 0
else: else:
success = compile_path() success = compile_path()

View File

@ -44,6 +44,8 @@ Extension modules
Library Library
- compileall now supports quiet operation.
- The BaseHTTPServer implements now optionally HTTP/1.1 persistent - The BaseHTTPServer implements now optionally HTTP/1.1 persistent
connections. connections.