diff options
Diffstat (limited to 'Lib/compileall.py')
| -rw-r--r-- | Lib/compileall.py | 143 |
1 files changed, 100 insertions, 43 deletions
diff --git a/Lib/compileall.py b/Lib/compileall.py index a5c82a33b0..910f3057f4 100644 --- a/Lib/compileall.py +++ b/Lib/compileall.py @@ -9,14 +9,14 @@ recursing into subdirectories. (Even though it should do so for packages -- for now, you'll have to deal with packages separately.) See module py_compile for details of the actual byte-compilation. - """ - import os import sys import py_compile +import struct +import imp -__all__ = ["compile_dir","compile_path"] +__all__ = ["compile_dir","compile_file","compile_path"] def compile_dir(dir, maxlevels=10, ddir=None, force=0, rx=None, quiet=0): @@ -30,7 +30,6 @@ def compile_dir(dir, maxlevels=10, ddir=None, directory name that will show up in error messages) force: if 1, force compilation, even if timestamps are up-to-date quiet: if 1, be quiet during compilation - """ if not quiet: print 'Listing', dir, '...' @@ -47,43 +46,70 @@ def compile_dir(dir, maxlevels=10, ddir=None, dfile = os.path.join(ddir, name) else: dfile = None - if rx is not None: - mo = rx.search(fullname) - if mo: - continue - if os.path.isfile(fullname): - head, tail = name[:-3], name[-3:] - if tail == '.py': - cfile = fullname + (__debug__ and 'c' or 'o') - ftime = os.stat(fullname).st_mtime - try: ctime = os.stat(cfile).st_mtime - except os.error: ctime = 0 - if (ctime > ftime) and not force: continue - if not quiet: - print 'Compiling', fullname, '...' - try: - ok = py_compile.compile(fullname, None, dfile, True) - except KeyboardInterrupt: - raise KeyboardInterrupt - except py_compile.PyCompileError,err: - if quiet: - print 'Compiling', fullname, '...' - print err.msg - success = 0 - except IOError, e: - print "Sorry", e - success = 0 - else: - if ok == 0: - success = 0 + if not os.path.isdir(fullname): + if not compile_file(fullname, ddir, force, rx, quiet): + success = 0 elif maxlevels > 0 and \ name != os.curdir and name != os.pardir and \ os.path.isdir(fullname) and \ not os.path.islink(fullname): - if not compile_dir(fullname, maxlevels - 1, dfile, force, rx, quiet): + if not compile_dir(fullname, maxlevels - 1, dfile, force, rx, + quiet): success = 0 return success +def compile_file(fullname, ddir=None, force=0, rx=None, quiet=0): + """Byte-compile one file. + + Arguments (only fullname is required): + + fullname: the file to byte-compile + ddir: if given, purported directory name (this is the + directory name that will show up in error messages) + force: if 1, force compilation, even if timestamps are up-to-date + quiet: if 1, be quiet during compilation + """ + success = 1 + name = os.path.basename(fullname) + if ddir is not None: + dfile = os.path.join(ddir, name) + else: + dfile = None + if rx is not None: + mo = rx.search(fullname) + if mo: + return success + if os.path.isfile(fullname): + head, tail = name[:-3], name[-3:] + if tail == '.py': + if not force: + try: + mtime = int(os.stat(fullname).st_mtime) + expect = struct.pack('<4sl', imp.get_magic(), mtime) + cfile = fullname + (__debug__ and 'c' or 'o') + with open(cfile, 'rb') as chandle: + actual = chandle.read(8) + if expect == actual: + return success + except IOError: + pass + if not quiet: + print 'Compiling', fullname, '...' + try: + ok = py_compile.compile(fullname, None, dfile, True) + except py_compile.PyCompileError,err: + if quiet: + print 'Compiling', fullname, '...' + print err.msg + success = 0 + except IOError, e: + print "Sorry", e + success = 0 + else: + if ok == 0: + success = 0 + return success + def compile_path(skip_curdir=1, maxlevels=0, force=0, quiet=0): """Byte-compile all module on sys.path. @@ -93,7 +119,6 @@ def compile_path(skip_curdir=1, maxlevels=0, force=0, quiet=0): maxlevels: max recursion level (default 0) force: as for compile_dir() (default 0) quiet: as for compile_dir() (default 0) - """ success = 1 for dir in sys.path: @@ -104,15 +129,34 @@ def compile_path(skip_curdir=1, maxlevels=0, force=0, quiet=0): force, quiet=quiet) return success +def expand_args(args, flist): + """read names in flist and append to args""" + expanded = args[:] + if flist: + try: + if flist == '-': + fd = sys.stdin + else: + fd = open(flist) + while 1: + line = fd.readline() + if not line: + break + expanded.append(line[:-1]) + except IOError: + print "Error reading file list %s" % flist + raise + return expanded + def main(): """Script main program.""" import getopt try: - opts, args = getopt.getopt(sys.argv[1:], 'lfqd:x:') + opts, args = getopt.getopt(sys.argv[1:], 'lfqd:x:i:') except getopt.error, msg: print msg print "usage: python compileall.py [-l] [-f] [-q] [-d destdir] " \ - "[-x regexp] [directory ...]" + "[-x regexp] [-i list] [directory|file ...]" print "-l: don't recurse down" print "-f: force rebuild even if timestamps are up-to-date" print "-q: quiet operation" @@ -120,12 +164,14 @@ def main(): print " if no directory arguments, -l sys.path is assumed" print "-x regexp: skip files matching the regular expression regexp" print " the regexp is searched for in the full path of the file" + print "-i list: expand list with its content (file and directory names)" sys.exit(2) maxlevels = 10 ddir = None force = 0 quiet = 0 rx = None + flist = None for o, a in opts: if o == '-l': maxlevels = 0 if o == '-d': ddir = a @@ -134,17 +180,28 @@ def main(): if o == '-x': import re rx = re.compile(a) + if o == '-i': flist = a if ddir: - if len(args) != 1: + if len(args) != 1 and not os.path.isdir(args[0]): print "-d destdir require exactly one directory argument" sys.exit(2) success = 1 try: - if args: - for dir in args: - if not compile_dir(dir, maxlevels, ddir, - force, rx, quiet): - success = 0 + if args or flist: + try: + if flist: + args = expand_args(args, flist) + except IOError: + success = 0 + if success: + for arg in args: + if os.path.isdir(arg): + if not compile_dir(arg, maxlevels, ddir, + force, rx, quiet): + success = 0 + else: + if not compile_file(arg, ddir, force, rx, quiet): + success = 0 else: success = compile_path() except KeyboardInterrupt: |