summaryrefslogtreecommitdiffstats
path: root/Lib/distutils/command
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-10-25 23:08:47 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-10-25 23:08:47 (GMT)
commit04fe7c01a8a0dd8a7234dd0f527e22386c2fed04 (patch)
treef4227e1b677431d14f9d8757e6ade6d858f422cc /Lib/distutils/command
parent4824c25e756280b13705c00fd56cb307e5a44cc7 (diff)
downloadcpython-04fe7c01a8a0dd8a7234dd0f527e22386c2fed04.zip
cpython-04fe7c01a8a0dd8a7234dd0f527e22386c2fed04.tar.gz
cpython-04fe7c01a8a0dd8a7234dd0f527e22386c2fed04.tar.bz2
Merged revisions 75669-75671 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r75669 | tarek.ziade | 2009-10-24 17:10:37 +0200 (Sat, 24 Oct 2009) | 1 line Issue #7071: byte-compilation in Distutils now looks at sys.dont_write_bytecode ........ r75670 | tarek.ziade | 2009-10-24 17:19:03 +0200 (Sat, 24 Oct 2009) | 1 line fixed finally state in distutils.test_util ........ r75671 | tarek.ziade | 2009-10-24 17:51:30 +0200 (Sat, 24 Oct 2009) | 1 line fixed warning and error message ........
Diffstat (limited to 'Lib/distutils/command')
-rw-r--r--Lib/distutils/command/build_py.py5
-rw-r--r--Lib/distutils/command/install_lib.py6
2 files changed, 11 insertions, 0 deletions
diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py
index 4cc80f7..fa08579 100644
--- a/Lib/distutils/command/build_py.py
+++ b/Lib/distutils/command/build_py.py
@@ -5,6 +5,7 @@ Implements the Distutils 'build_py' command."""
__revision__ = "$Id$"
import os
+import sys
from glob import glob
from distutils.core import Command
@@ -369,6 +370,10 @@ class build_py(Command):
self.build_module(module, module_file, package)
def byte_compile(self, files):
+ if sys.dont_write_bytecode:
+ self.warn('byte-compiling is disabled, skipping.')
+ return
+
from distutils.util import byte_compile
prefix = self.build_lib
if prefix[-1] != os.sep:
diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py
index 85fb3ac..6022d30 100644
--- a/Lib/distutils/command/install_lib.py
+++ b/Lib/distutils/command/install_lib.py
@@ -6,6 +6,8 @@ Implements the Distutils 'install_lib' command
__revision__ = "$Id$"
import os
+import sys
+
from distutils.core import Command
from distutils.errors import DistutilsOptionError
@@ -115,6 +117,10 @@ class install_lib(Command):
return outfiles
def byte_compile(self, files):
+ if sys.dont_write_bytecode:
+ self.warn('byte-compiling is disabled, skipping.')
+ return
+
from distutils.util import byte_compile
# Get the "--root" directory supplied to the "install" command,