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

Patch from Perry Stoll: typo fix, make sure we only compile .py files.

Browse source
This commit is contained in:
Greg Ward 1999-08-29 18:19:37 +00:00
parent 5d60fcf02a
commit 440e2f51ea
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/distutils/command/install_lib.py
View file

@ -9,7 +9,7 @@ from distutils.util import copy_tree
class InstallPy (Command): class InstallPy (Command):
options = [('dir=', 'd', "directory to install to"), options = [('dir=', 'd', "directory to install to"),
('build-dir=' 'b', "build directory (where to install from)"), ('build-dir=','b', "build directory (where to install from)"),
('compile', 'c', "compile .py to .pyc"), ('compile', 'c', "compile .py to .pyc"),
('optimize', 'o', "compile .py to .pyo (optimized)"), ('optimize', 'o', "compile .py to .pyo (optimized)"),
] ]
@ -54,11 +54,14 @@ class InstallPy (Command):
for f in outfiles: for f in outfiles:
# XXX can't assume this filename mapping! # XXX can't assume this filename mapping!
out_fn = string.replace (f, '.py', '.pyc')
self.make_file (f, out_fn, compile, (f,), # only compile the file if it is actually a .py file
"compiling %s -> %s" % (f, out_fn), if f[-3:] == '.py':
"compilation of %s skipped" % f) out_fn = string.replace (f, '.py', '.pyc')
self.make_file (f, out_fn, compile, (f,),
"compiling %s -> %s" % (f, out_fn),
"compilation of %s skipped" % f)
# XXX ignore self.optimize for now, since we don't really know if # XXX ignore self.optimize for now, since we don't really know if
# we're compiling optimally or not, and couldn't pick what to do # we're compiling optimally or not, and couldn't pick what to do

13
Lib/distutils/command/install_py.py
View file

@ -9,7 +9,7 @@ from distutils.util import copy_tree
class InstallPy (Command): class InstallPy (Command):
options = [('dir=', 'd', "directory to install to"), options = [('dir=', 'd', "directory to install to"),
('build-dir=' 'b', "build directory (where to install from)"), ('build-dir=','b', "build directory (where to install from)"),
('compile', 'c', "compile .py to .pyc"), ('compile', 'c', "compile .py to .pyc"),
('optimize', 'o', "compile .py to .pyo (optimized)"), ('optimize', 'o', "compile .py to .pyo (optimized)"),
] ]
@ -54,11 +54,14 @@ class InstallPy (Command):
for f in outfiles: for f in outfiles:
# XXX can't assume this filename mapping! # XXX can't assume this filename mapping!
out_fn = string.replace (f, '.py', '.pyc')
self.make_file (f, out_fn, compile, (f,), # only compile the file if it is actually a .py file
"compiling %s -> %s" % (f, out_fn), if f[-3:] == '.py':
"compilation of %s skipped" % f) out_fn = string.replace (f, '.py', '.pyc')
self.make_file (f, out_fn, compile, (f,),
"compiling %s -> %s" % (f, out_fn),
"compilation of %s skipped" % f)
# XXX ignore self.optimize for now, since we don't really know if # XXX ignore self.optimize for now, since we don't really know if
# we're compiling optimally or not, and couldn't pick what to do # we're compiling optimally or not, and couldn't pick what to do