Kaydet (Commit) 440e2f51 authored tarafından Greg Ward's avatar Greg Ward

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

üst 5d60fcf0
...@@ -9,7 +9,7 @@ from distutils.util import copy_tree ...@@ -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,12 +54,15 @@ class InstallPy (Command): ...@@ -54,12 +54,15 @@ 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,),
"compiling %s -> %s" % (f, out_fn),
"compilation of %s skipped" % f)
# only compile the file if it is actually a .py file
if f[-3:] == '.py':
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
# even if we did know. ;-( # even if we did know. ;-(
......
...@@ -9,7 +9,7 @@ from distutils.util import copy_tree ...@@ -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,12 +54,15 @@ class InstallPy (Command): ...@@ -54,12 +54,15 @@ 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,),
"compiling %s -> %s" % (f, out_fn),
"compilation of %s skipped" % f)
# only compile the file if it is actually a .py file
if f[-3:] == '.py':
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
# even if we did know. ;-( # even if we did know. ;-(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment