mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix `Tools/scripts/checkpyc.py` after PEP 3147.

Browse source
This commit is contained in:
Florent Xicluna 2010-08-09 12:26:44 +00:00
parent e4a3380bb0
commit c7eaede21e
2 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Misc/NEWS
View file

@ -150,6 +150,8 @@ Library
Tools/Demos Tools/Demos
----------- -----------
- Fix ``Tools/scripts/checkpyc.py`` after PEP 3147.
- Issue #8867: Fix ``Tools/scripts/serve.py`` to work with files containing - Issue #8867: Fix ``Tools/scripts/serve.py`` to work with files containing
non-ASCII content. non-ASCII content.

37
Tools/scripts/checkpyc.py
View file

@ -7,14 +7,17 @@ import os
from stat import ST_MTIME from stat import ST_MTIME
import imp import imp
# PEP 3147 compatibility (PYC Repository Directories)
cache_from_source = (imp.cache_from_source if hasattr(imp, 'get_tag') else
lambda path: path + 'c')
def main(): def main():
silent = 0 if len(sys.argv) > 1:
verbose = 0 verbose = (sys.argv[1] == '-v')
if sys.argv[1:]: silent = (sys.argv[1] == '-s')
if sys.argv[1] == '-v': else:
verbose = 1 verbose = silent = False
elif sys.argv[1] == '-s':
silent = 1
MAGIC = imp.get_magic() MAGIC = imp.get_magic()
if not silent: if not silent:
print('Using MAGIC word', repr(MAGIC)) print('Using MAGIC word', repr(MAGIC))
@ -26,9 +29,8 @@ def main():
continue continue
if not silent: if not silent:
print('Checking ', repr(dirname), '...') print('Checking ', repr(dirname), '...')
names.sort() for name in sorted(names):
for name in names: if name.endswith('.py'):
if name[-3:] == '.py':
name = os.path.join(dirname, name) name = os.path.join(dirname, name)
try: try:
st = os.stat(name) st = os.stat(name)
@ -37,30 +39,31 @@ def main():
continue continue
if verbose: if verbose:
print('Check', repr(name), '...') print('Check', repr(name), '...')
name_c = name + 'c' name_c = cache_from_source(name)
try: try:
f = open(name_c, 'r') with open(name_c, 'rb') as f:
magic_str = f.read(4)
mtime_str = f.read(4)
except IOError: except IOError:
print('Cannot open', repr(name_c)) print('Cannot open', repr(name_c))
continue continue
magic_str = f.read(4)
mtime_str = f.read(4)
f.close()
if magic_str != MAGIC: if magic_str != MAGIC:
print('Bad MAGIC word in ".pyc" file', end=' ') print('Bad MAGIC word in ".pyc" file', end=' ')
print(repr(name_c)) print(repr(name_c))
continue continue
mtime = get_long(mtime_str) mtime = get_long(mtime_str)
if mtime == 0 or mtime == -1: if mtime in {0, -1}:
print('Bad ".pyc" file', repr(name_c)) print('Bad ".pyc" file', repr(name_c))
elif mtime != st[ST_MTIME]: elif mtime != st[ST_MTIME]:
print('Out-of-date ".pyc" file', end=' ') print('Out-of-date ".pyc" file', end=' ')
print(repr(name_c)) print(repr(name_c))
def get_long(s): def get_long(s):
if len(s) != 4: if len(s) != 4:
return -1 return -1
return ord(s[0]) + (ord(s[1])<<8) + (ord(s[2])<<16) + (ord(s[3])<<24) return s[0] + (s[1] << 8) + (s[2] << 16) + (s[3] << 24)
if __name__ == '__main__': if __name__ == '__main__':
main() main()