mirror of
https://github.com/python/cpython.git
synced 2024-12-23 16:54:14 +08:00
dd15f6c315
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61239 | andrew.kuchling | 2008-03-05 01:44:41 +0100 (Wed, 05 Mar 2008) | 1 line Add more items; add fragmentary notes ........ r61240 | amaury.forgeotdarc | 2008-03-05 02:50:33 +0100 (Wed, 05 Mar 2008) | 13 lines Issue#2238: some syntax errors from *args or **kwargs expressions would give bogus error messages, because of untested exceptions:: >>> f(**g(1=2)) XXX undetected error Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: 'int' object is not iterable instead of the expected SyntaxError: keyword can't be an expression Will backport. ........ r61241 | neal.norwitz | 2008-03-05 06:10:48 +0100 (Wed, 05 Mar 2008) | 3 lines Remove the files/dirs after closing the DB so the tests work on Windows. Patch from Trent Nelson. Also simplified removing a file by using test_support. ........ r61242 | neal.norwitz | 2008-03-05 06:14:18 +0100 (Wed, 05 Mar 2008) | 3 lines Get this test to pass even when there is no sound card in the system. Patch from Trent Nelson. (I can't test this.) ........ r61243 | neal.norwitz | 2008-03-05 06:20:44 +0100 (Wed, 05 Mar 2008) | 3 lines Catch OSError when trying to remove a file in case removal fails. This should prevent a failure in tearDown masking any real test failure. ........ r61244 | neal.norwitz | 2008-03-05 06:38:06 +0100 (Wed, 05 Mar 2008) | 5 lines Make the timeout longer to give slow machines a chance to pass the test before timing out. This doesn't change the duration of the test under normal circumstances. This is targetted at fixing the spurious failures on the FreeBSD buildbot primarily. ........ r61245 | neal.norwitz | 2008-03-05 06:49:03 +0100 (Wed, 05 Mar 2008) | 1 line Tabs -> spaces ........ r61246 | neal.norwitz | 2008-03-05 06:50:20 +0100 (Wed, 05 Mar 2008) | 1 line Use -u urlfetch to run more tests ........ r61247 | neal.norwitz | 2008-03-05 06:51:20 +0100 (Wed, 05 Mar 2008) | 1 line test_smtplib sometimes reports leaks too, suppress it ........ r61248 | jeffrey.yasskin | 2008-03-05 07:19:56 +0100 (Wed, 05 Mar 2008) | 5 lines Fix test_socketserver on Windows after r61099 added several signal.alarm() calls (which don't exist on non-Unix platforms). Thanks to Trent Nelson for the report and patch. ........ r61249 | georg.brandl | 2008-03-05 08:10:35 +0100 (Wed, 05 Mar 2008) | 2 lines Fix some rst. ........ r61252 | thomas.heller | 2008-03-05 15:53:39 +0100 (Wed, 05 Mar 2008) | 2 lines News entry for yesterdays commit. ........ r61253 | thomas.heller | 2008-03-05 16:34:29 +0100 (Wed, 05 Mar 2008) | 3 lines Issue 1872: Changed the struct module typecode from 't' to '?', for compatibility with PEP3118. ........ r61254 | skip.montanaro | 2008-03-05 17:41:09 +0100 (Wed, 05 Mar 2008) | 4 lines Elaborate on the role of the altinstall target when installing multiple versions. ........ r61255 | georg.brandl | 2008-03-05 20:31:44 +0100 (Wed, 05 Mar 2008) | 2 lines #2239: PYTHONPATH delimiter is os.pathsep. ........ r61256 | raymond.hettinger | 2008-03-05 21:59:58 +0100 (Wed, 05 Mar 2008) | 1 line C implementation of itertools.permutations(). ........ r61257 | raymond.hettinger | 2008-03-05 22:04:32 +0100 (Wed, 05 Mar 2008) | 1 line Small code cleanup. ........ r61260 | martin.v.loewis | 2008-03-05 23:24:31 +0100 (Wed, 05 Mar 2008) | 2 lines cd PCbuild only after deleting all pyc files. ........ r61261 | raymond.hettinger | 2008-03-06 02:15:52 +0100 (Thu, 06 Mar 2008) | 1 line Add examples. ........ r61262 | andrew.kuchling | 2008-03-06 02:36:27 +0100 (Thu, 06 Mar 2008) | 1 line Add two items ........ r61263 | georg.brandl | 2008-03-06 07:47:18 +0100 (Thu, 06 Mar 2008) | 2 lines #1725737: ignore other VC directories other than CVS and SVN's too. ........ r61264 | martin.v.loewis | 2008-03-06 07:55:22 +0100 (Thu, 06 Mar 2008) | 4 lines Patch #2232: os.tmpfile might fail on Windows if the user has no permission to create files in the root directory. Will backport to 2.5. ........ r61269 | georg.brandl | 2008-03-06 08:19:15 +0100 (Thu, 06 Mar 2008) | 2 lines Expand on re.split behavior with captured expressions. ........ r61270 | georg.brandl | 2008-03-06 08:22:09 +0100 (Thu, 06 Mar 2008) | 2 lines Little clarification of assignments. ........ r61271 | georg.brandl | 2008-03-06 08:31:34 +0100 (Thu, 06 Mar 2008) | 2 lines Add isinstance/issubclass to tutorial. ........ r61272 | georg.brandl | 2008-03-06 08:34:52 +0100 (Thu, 06 Mar 2008) | 2 lines Add missing NEWS entry for r61263. ........ r61273 | georg.brandl | 2008-03-06 08:41:16 +0100 (Thu, 06 Mar 2008) | 2 lines #2225: return nonzero status code from py_compile if not all files could be compiled. ........ r61274 | georg.brandl | 2008-03-06 08:43:02 +0100 (Thu, 06 Mar 2008) | 2 lines #2220: handle matching failure more gracefully. ........ r61275 | georg.brandl | 2008-03-06 08:45:52 +0100 (Thu, 06 Mar 2008) | 2 lines Bug #2220: handle rlcompleter attribute match failure more gracefully. ........ r61278 | martin.v.loewis | 2008-03-06 14:49:47 +0100 (Thu, 06 Mar 2008) | 1 line Rely on x64 platform configuration when building _bsddb on AMD64. ........ r61279 | martin.v.loewis | 2008-03-06 14:50:28 +0100 (Thu, 06 Mar 2008) | 1 line Update db-4.4.20 build procedure. ........ r61285 | raymond.hettinger | 2008-03-06 21:52:01 +0100 (Thu, 06 Mar 2008) | 1 line More tests. ........ r61286 | raymond.hettinger | 2008-03-06 23:51:36 +0100 (Thu, 06 Mar 2008) | 1 line Issue 2246: itertools grouper object did not participate in GC (should be backported). ........ r61288 | raymond.hettinger | 2008-03-07 02:33:20 +0100 (Fri, 07 Mar 2008) | 1 line Tweak recipes and tests ........ r61289 | jeffrey.yasskin | 2008-03-07 07:22:15 +0100 (Fri, 07 Mar 2008) | 5 lines Progress on issue #1193577 by adding a polling .shutdown() method to SocketServers. The core of the patch was written by Pedro Werneck, but any bugs are mine. I've also rearranged the code for timeouts in order to avoid interfering with the shutdown poll. ........ r61290 | nick.coghlan | 2008-03-07 15:13:28 +0100 (Fri, 07 Mar 2008) | 1 line Speed up with statements by storing the __exit__ method on the stack instead of in a temp variable (bumps the magic number for pyc files) ........ r61298 | andrew.kuchling | 2008-03-07 22:09:23 +0100 (Fri, 07 Mar 2008) | 1 line Grammar fix ........ r61303 | georg.brandl | 2008-03-08 10:54:06 +0100 (Sat, 08 Mar 2008) | 2 lines #2253: fix continue vs. finally docs. ........ r61304 | marc-andre.lemburg | 2008-03-08 11:01:43 +0100 (Sat, 08 Mar 2008) | 3 lines Add new name for Mandrake: Mandriva. ........ r61305 | georg.brandl | 2008-03-08 11:05:24 +0100 (Sat, 08 Mar 2008) | 2 lines #1533486: fix types in refcount intro. ........ r61312 | facundo.batista | 2008-03-08 17:50:27 +0100 (Sat, 08 Mar 2008) | 5 lines Issue 1106316. post_mortem()'s parameter, traceback, is now optional: it defaults to the traceback of the exception that is currently being handled. ........ r61313 | jeffrey.yasskin | 2008-03-08 19:26:54 +0100 (Sat, 08 Mar 2008) | 2 lines Add tests for with and finally performance to pybench. ........ r61314 | jeffrey.yasskin | 2008-03-08 21:08:21 +0100 (Sat, 08 Mar 2008) | 2 lines Fix pybench for pythons < 2.6, tested back to 2.3. ........ r61317 | jeffrey.yasskin | 2008-03-08 22:35:15 +0100 (Sat, 08 Mar 2008) | 3 lines Well that was dumb. platform.python_implementation returns a function, not a string. ........ r61329 | georg.brandl | 2008-03-09 16:11:39 +0100 (Sun, 09 Mar 2008) | 2 lines #2249: document assertTrue and assertFalse. ........ r61332 | neal.norwitz | 2008-03-09 20:03:42 +0100 (Sun, 09 Mar 2008) | 4 lines Introduce a lock to fix a race condition which caused an exception in the test. Some buildbots were consistently failing (e.g., amd64). Also remove a couple of semi-colons. ........ r61344 | raymond.hettinger | 2008-03-11 01:19:07 +0100 (Tue, 11 Mar 2008) | 1 line Add recipe to docs. ........ r61350 | guido.van.rossum | 2008-03-11 22:18:06 +0100 (Tue, 11 Mar 2008) | 3 lines Fix the overflows in expandtabs(). "This time for sure!" (Exploit at request.) ........ r61351 | raymond.hettinger | 2008-03-11 22:37:46 +0100 (Tue, 11 Mar 2008) | 1 line Improve docs for itemgetter(). Show that it works with slices. ........ r61363 | georg.brandl | 2008-03-13 08:15:56 +0100 (Thu, 13 Mar 2008) | 2 lines #2265: fix example. ........ r61364 | georg.brandl | 2008-03-13 08:17:14 +0100 (Thu, 13 Mar 2008) | 2 lines #2270: fix typo. ........ r61365 | georg.brandl | 2008-03-13 08:21:41 +0100 (Thu, 13 Mar 2008) | 2 lines #1720705: add docs about import/threading interaction, wording by Nick. ........ r61366 | andrew.kuchling | 2008-03-13 12:07:35 +0100 (Thu, 13 Mar 2008) | 1 line Add class decorators ........ r61367 | raymond.hettinger | 2008-03-13 17:43:17 +0100 (Thu, 13 Mar 2008) | 1 line Add 2-to-3 support for the itertools moved to builtins or renamed. ........ r61368 | raymond.hettinger | 2008-03-13 17:43:59 +0100 (Thu, 13 Mar 2008) | 1 line Consistent tense. ........ r61369 | raymond.hettinger | 2008-03-13 20:03:51 +0100 (Thu, 13 Mar 2008) | 1 line Issue 2274: Add heapq.heappushpop(). ........ r61370 | raymond.hettinger | 2008-03-13 20:33:34 +0100 (Thu, 13 Mar 2008) | 1 line Simplify the nlargest() code using heappushpop(). ........ r61371 | brett.cannon | 2008-03-13 21:27:00 +0100 (Thu, 13 Mar 2008) | 4 lines Move test_thread over to unittest. Commits GHOP 237. Thanks Benjamin Peterson for the patch. ........ r61372 | brett.cannon | 2008-03-13 21:33:10 +0100 (Thu, 13 Mar 2008) | 4 lines Move test_tokenize to doctest. Done as GHOP 238 by Josip Dzolonga. ........ r61373 | brett.cannon | 2008-03-13 21:47:41 +0100 (Thu, 13 Mar 2008) | 4 lines Convert test_contains, test_crypt, and test_select to unittest. Patch from GHOP 294 by David Marek. ........ r61374 | brett.cannon | 2008-03-13 22:02:16 +0100 (Thu, 13 Mar 2008) | 4 lines Move test_gdbm to use unittest. Closes issue #1960. Thanks Giampaolo Rodola. ........ r61375 | brett.cannon | 2008-03-13 22:09:28 +0100 (Thu, 13 Mar 2008) | 4 lines Convert test_fcntl to unittest. Closes issue #2055. Thanks Giampaolo Rodola. ........ r61376 | raymond.hettinger | 2008-03-14 06:03:44 +0100 (Fri, 14 Mar 2008) | 1 line Leave heapreplace() unchanged. ........ r61378 | martin.v.loewis | 2008-03-14 14:56:09 +0100 (Fri, 14 Mar 2008) | 2 lines Patch #2284: add -x64 option to rt.bat. ........ r61379 | martin.v.loewis | 2008-03-14 14:57:59 +0100 (Fri, 14 Mar 2008) | 2 lines Use -x64 flag. ........ r61382 | brett.cannon | 2008-03-14 15:03:10 +0100 (Fri, 14 Mar 2008) | 2 lines Remove a bad test. ........ r61383 | mark.dickinson | 2008-03-14 15:23:37 +0100 (Fri, 14 Mar 2008) | 9 lines Issue 705836: Fix struct.pack(">f", 1e40) to behave consistently across platforms: it should now raise OverflowError on all platforms. (Previously it raised OverflowError only on non IEEE 754 platforms.) Also fix the (already existing) test for this behaviour so that it actually raises TestFailed instead of just referencing it. ........ r61387 | thomas.heller | 2008-03-14 22:06:21 +0100 (Fri, 14 Mar 2008) | 1 line Remove unneeded initializer. ........ r61388 | martin.v.loewis | 2008-03-14 22:19:28 +0100 (Fri, 14 Mar 2008) | 2 lines Run debug version, cd to PCbuild. ........ r61392 | georg.brandl | 2008-03-15 00:10:34 +0100 (Sat, 15 Mar 2008) | 2 lines Remove obsolete paragraph. #2288. ........ r61395 | georg.brandl | 2008-03-15 01:20:19 +0100 (Sat, 15 Mar 2008) | 2 lines Fix lots of broken links in the docs, found by Sphinx' external link checker. ........ r61396 | skip.montanaro | 2008-03-15 03:32:49 +0100 (Sat, 15 Mar 2008) | 1 line note that fork and forkpty raise OSError on failure ........ r61402 | skip.montanaro | 2008-03-15 17:04:45 +0100 (Sat, 15 Mar 2008) | 1 line add %f format to datetime - issue 1158 ........ r61403 | skip.montanaro | 2008-03-15 17:07:11 +0100 (Sat, 15 Mar 2008) | 2 lines . ........
186 lines
6.0 KiB
Python
186 lines
6.0 KiB
Python
"""Routine to "compile" a .py file to a .pyc (or .pyo) file.
|
|
|
|
This module has intimate knowledge of the format of .pyc files.
|
|
"""
|
|
|
|
import builtins
|
|
import imp
|
|
import marshal
|
|
import os
|
|
import re
|
|
import sys
|
|
import traceback
|
|
|
|
MAGIC = imp.get_magic()
|
|
|
|
__all__ = ["compile", "main", "PyCompileError"]
|
|
|
|
|
|
class PyCompileError(Exception):
|
|
"""Exception raised when an error occurs while attempting to
|
|
compile the file.
|
|
|
|
To raise this exception, use
|
|
|
|
raise PyCompileError(exc_type,exc_value,file[,msg])
|
|
|
|
where
|
|
|
|
exc_type: exception type to be used in error message
|
|
type name can be accesses as class variable
|
|
'exc_type_name'
|
|
|
|
exc_value: exception value to be used in error message
|
|
can be accesses as class variable 'exc_value'
|
|
|
|
file: name of file being compiled to be used in error message
|
|
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'
|
|
|
|
"""
|
|
|
|
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))
|
|
errmsg = tbtext.replace('File "<string>"', 'File "%s"' % file)
|
|
else:
|
|
errmsg = "Sorry: %s: %s" % (exc_type_name,exc_value)
|
|
|
|
Exception.__init__(self,msg or errmsg,exc_type_name,exc_value,file)
|
|
|
|
self.exc_type_name = exc_type_name
|
|
self.exc_value = exc_value
|
|
self.file = file
|
|
self.msg = msg or errmsg
|
|
|
|
def __str__(self):
|
|
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,
|
|
(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(r".*\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):
|
|
"""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.
|
|
|
|
Note that it isn't necessary to byte-compile Python modules for
|
|
execution efficiency -- Python itself byte-compiles a module when
|
|
it is loaded, and if it can, writes out the bytecode to the
|
|
corresponding .pyc (or .pyo) file.
|
|
|
|
However, if a Python installation is shared between users, it is a
|
|
good idea to byte-compile all modules upon installation, since
|
|
other users may not be able to write in the source directories,
|
|
and thus they won't be able to write the .pyc/.pyo file, and then
|
|
they would be byte-compiling every module each time it is loaded.
|
|
This can slow down program start-up considerably.
|
|
|
|
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'
|
|
try:
|
|
codeobject = builtins.compile(codestring, dfile or file,'exec')
|
|
except Exception as err:
|
|
py_exc = PyCompileError(err.__class__, err, dfile or file)
|
|
if doraise:
|
|
raise py_exc
|
|
else:
|
|
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)
|
|
|
|
def main(args=None):
|
|
"""Compile several source files.
|
|
|
|
The files named in 'args' (or on the command line, if 'args' is
|
|
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.
|
|
|
|
"""
|
|
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)
|
|
return rv
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|