diff options
Diffstat (limited to 'Lib/py_compile.py')
| -rw-r--r-- | Lib/py_compile.py | 150 |
1 files changed, 75 insertions, 75 deletions
diff --git a/Lib/py_compile.py b/Lib/py_compile.py index cce5ac145a..e0f98cb741 100644 --- a/Lib/py_compile.py +++ b/Lib/py_compile.py @@ -4,11 +4,12 @@ This module has intimate knowledge of the format of .pyc files. """ import builtins +import errno import imp import marshal import os -import re import sys +import tokenize import traceback MAGIC = imp.get_magic() @@ -37,16 +38,18 @@ class PyCompileError(Exception): can be accesses as class variable 'file' msg: string message to be written as error message - If no value is given, a default exception message will be given, - consistent with 'standard' py_compile output. - message (or default) can be accesses as class variable 'msg' + If no value is given, a default exception message will be + given, consistent with 'standard' py_compile output. + message (or default) can be accesses as class variable + 'msg' """ def __init__(self, exc_type, exc_value, file, msg=''): exc_type_name = exc_type.__name__ if exc_type is SyntaxError: - tbtext = ''.join(traceback.format_exception_only(exc_type, exc_value)) + tbtext = ''.join(traceback.format_exception_only( + exc_type, exc_value)) errmsg = tbtext.replace('File "<string>"', 'File "%s"' % file) else: errmsg = "Sorry: %s: %s" % (exc_type_name,exc_value) @@ -62,54 +65,32 @@ class PyCompileError(Exception): return self.msg -# Define an internal helper according to the platform -if os.name == "mac": - import MacOS - def set_creator_type(file): - MacOS.SetCreatorAndType(file, 'Pyth', 'PYC ') -else: - def set_creator_type(file): - pass - def wr_long(f, x): """Internal; write a 32-bit int to a file in little-endian order.""" - f.write(bytes([x & 0xff, + f.write(bytes([x & 0xff, (x >> 8) & 0xff, (x >> 16) & 0xff, (x >> 24) & 0xff])) -def read_encoding(file, default): - """Read the first two lines of the file looking for coding: xyzzy.""" - f = open(file, "rb") - try: - for i in range(2): - line = f.readline() - if not line: - break - m = re.match(br".*\bcoding:\s*(\S+)\b", line) - if m: - return m.group(1).decode("ascii") - return default - finally: - f.close() - -def compile(file, cfile=None, dfile=None, doraise=False): +def compile(file, cfile=None, dfile=None, doraise=False, optimize=-1): """Byte-compile one Python source file to Python bytecode. - Arguments: - - file: source filename - cfile: target filename; defaults to source with 'c' or 'o' appended - ('c' normally, 'o' in optimizing mode, giving .pyc or .pyo) - dfile: purported filename; defaults to source (this is the filename - that will show up in error messages) - doraise: flag indicating whether or not an exception should be - raised when a compile error is found. If an exception - occurs and this flag is set to False, a string - indicating the nature of the exception will be printed, - and the function will return to the caller. If an - exception occurs and this flag is set to True, a - PyCompileError exception will be raised. + :param file: The source file name. + :param cfile: The target byte compiled file name. When not given, this + defaults to the PEP 3147 location. + :param dfile: Purported file name, i.e. the file name that shows up in + error messages. Defaults to the source file name. + :param doraise: Flag indicating whether or not an exception should be + raised when a compile error is found. If an exception occurs and this + flag is set to False, a string indicating the nature of the exception + will be printed, and the function will return to the caller. If an + exception occurs and this flag is set to True, a PyCompileError + exception will be raised. + :param optimize: The optimization level for the compiler. Valid values + are -1, 0, 1 and 2. A value of -1 means to use the optimization + level of the current interpreter, as given by -O command line options. + + :return: Path to the resulting byte compiled file. Note that it isn't necessary to byte-compile Python modules for execution efficiency -- Python itself byte-compiles a module when @@ -126,20 +107,16 @@ def compile(file, cfile=None, dfile=None, doraise=False): See compileall.py for a script/module that uses this module to byte-compile all installed files (or all files in selected directories). - """ - encoding = read_encoding(file, "utf-8") - f = open(file, 'U', encoding=encoding) - try: - timestamp = int(os.fstat(f.fileno()).st_mtime) - except AttributeError: - timestamp = int(os.stat(file).st_mtime) - codestring = f.read() - f.close() - if codestring and codestring[-1] != '\n': - codestring = codestring + '\n' + with tokenize.open(file) as f: + try: + timestamp = int(os.fstat(f.fileno()).st_mtime) + except AttributeError: + timestamp = int(os.stat(file).st_mtime) + codestring = f.read() try: - codeobject = builtins.compile(codestring, dfile or file,'exec') + codeobject = builtins.compile(codestring, dfile or file, 'exec', + optimize=optimize) except Exception as err: py_exc = PyCompileError(err.__class__, err, dfile or file) if doraise: @@ -148,16 +125,23 @@ def compile(file, cfile=None, dfile=None, doraise=False): sys.stderr.write(py_exc.msg + '\n') return if cfile is None: - cfile = file + (__debug__ and 'c' or 'o') - fc = open(cfile, 'wb') - fc.write(b'\0\0\0\0') - wr_long(fc, timestamp) - marshal.dump(codeobject, fc) - fc.flush() - fc.seek(0, 0) - fc.write(MAGIC) - fc.close() - set_creator_type(cfile) + if optimize >= 0: + cfile = imp.cache_from_source(file, debug_override=not optimize) + else: + cfile = imp.cache_from_source(file) + try: + os.makedirs(os.path.dirname(cfile)) + except OSError as error: + if error.errno != errno.EEXIST: + raise + with open(cfile, 'wb') as fc: + fc.write(b'\0\0\0\0') + wr_long(fc, timestamp) + marshal.dump(codeobject, fc) + fc.flush() + fc.seek(0, 0) + fc.write(MAGIC) + return cfile def main(args=None): """Compile several source files. @@ -166,19 +150,35 @@ def main(args=None): not specified) are compiled and the resulting bytecode is cached in the normal manner. This function does not search a directory structure to locate source files; it only compiles files named - explicitly. + explicitly. If '-' is the only parameter in args, the list of + files is taken from standard input. """ if args is None: args = sys.argv[1:] rv = 0 - for filename in args: - try: - compile(filename, doraise=True) - except PyCompileError as err: - # return value to indicate at least one failure - rv = 1 - sys.stderr.write(err.msg) + if args == ['-']: + while True: + filename = sys.stdin.readline() + if not filename: + break + filename = filename.rstrip('\n') + try: + compile(filename, doraise=True) + except PyCompileError as error: + rv = 1 + sys.stderr.write("%s\n" % error.msg) + except IOError as error: + rv = 1 + sys.stderr.write("%s\n" % error) + else: + for filename in args: + try: + compile(filename, doraise=True) + except PyCompileError as error: + # return value to indicate at least one failure + rv = 1 + sys.stderr.write(error.msg) return rv if __name__ == "__main__": |