Index: Lib/compileall.py =================================================================== --- Lib/compileall.py (Revision 78964) +++ Lib/compileall.py (Arbeitskopie) @@ -17,7 +17,7 @@ import struct import imp -__all__ = ["compile_dir","compile_path"] +__all__ = ["compile_dir","compile_files","compile_path"] def compile_dir(dir, maxlevels=10, ddir=None, force=0, rx=None, quiet=0): @@ -48,41 +48,9 @@ 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': - 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: - continue - except IOError: - pass - 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 \ @@ -92,6 +60,59 @@ success = 0 return success +def compile_file(fullname, ddir=None, force=0, rx=None, quiet=0): + """Byte-compile file. + file: 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 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 + return success + def compile_path(skip_curdir=1, maxlevels=0, force=0, quiet=0): """Byte-compile all module on sys.path. @@ -112,6 +133,27 @@ force, quiet=quiet) return success +def expand_args(args): + expanded = [] + for arg in args: + if arg.startswith('@'): + try: + if arg == '@-': + fd = sys.stdin + else: + fd = open(arg[1:]) + while 1: + line = fd.readline() + if not line: + break + expanded.append(line[:-1]) + except IOError: + print "Error reading file list %s" % arg[1:] + raise + else: + expanded.append(arg) + return expanded + def main(): """Script main program.""" import getopt @@ -120,7 +162,7 @@ except getopt.error, msg: print msg print "usage: python compileall.py [-l] [-f] [-q] [-d destdir] " \ - "[-x regexp] [directory ...]" + "[-x regexp] [directory|file ...] [@list]" print "-l: don't recurse down" print "-f: force rebuild even if timestamps are up-to-date" print "-q: quiet operation" @@ -128,6 +170,7 @@ 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 "@list: expand list with its content (file and directory names)" sys.exit(2) maxlevels = 10 ddir = None @@ -149,10 +192,19 @@ success = 1 try: if args: - for dir in args: - if not compile_dir(dir, maxlevels, ddir, - force, rx, quiet): - success = 0 + try: + args = expand_args(args) + 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: