Commit 3a9c591f authored by Tarek Ziade's avatar Tarek Ziade

respect the sys.dont_write_bytecode flag. Fixes #147

--HG--
branch : distribute
extra : rebase_source : 889c1badc92b1de14352a141865172b0a39384fa
parent b53fad8a
...@@ -17,6 +17,7 @@ CHANGES ...@@ -17,6 +17,7 @@ CHANGES
* Issue 100: Fixed develop --user not taking '.' in PYTHONPATH into account * Issue 100: Fixed develop --user not taking '.' in PYTHONPATH into account
* Issue 134: removed spurious UserWarnings. Patch by VanLindberg * Issue 134: removed spurious UserWarnings. Patch by VanLindberg
* Issue 138: cant_write_to_target error when setup_requires is used. * Issue 138: cant_write_to_target error when setup_requires is used.
* Issue 147: respect the sys.dont_write_bytecode flag
------ ------
0.6.10 0.6.10
......
...@@ -5,7 +5,8 @@ import distutils.core, setuptools.command ...@@ -5,7 +5,8 @@ import distutils.core, setuptools.command
from setuptools.depends import Require from setuptools.depends import Require
from distutils.core import Command as _Command from distutils.core import Command as _Command
from distutils.util import convert_path from distutils.util import convert_path
import os.path import os
import sys
__version__ = '0.6' __version__ = '0.6'
__all__ = [ __all__ = [
...@@ -95,4 +96,9 @@ def findall(dir = os.curdir): ...@@ -95,4 +96,9 @@ def findall(dir = os.curdir):
import distutils.filelist import distutils.filelist
distutils.filelist.findall = findall # fix findall bug in distutils. distutils.filelist.findall = findall # fix findall bug in distutils.
# sys.dont_write_bytecode was introduced in Python 2.6.
if ((hasattr(sys, "dont_write_bytecode") and sys.dont_write_bytecode) or
(not hasattr(sys, "dont_write_bytecode") and os.environ.get("PYTHONDONTWRITEBYTECODE"))):
_dont_write_bytecode = True
else:
_dont_write_bytecode = False
...@@ -12,7 +12,7 @@ __ http://packages.python.org/distribute/easy_install.html ...@@ -12,7 +12,7 @@ __ http://packages.python.org/distribute/easy_install.html
""" """
import sys, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random import sys, os.path, zipimport, shutil, tempfile, zipfile, re, stat, random
from glob import glob from glob import glob
from setuptools import Command from setuptools import Command, _dont_write_bytecode
from setuptools.sandbox import run_setup from setuptools.sandbox import run_setup
from distutils import log, dir_util from distutils import log, dir_util
from distutils.util import convert_path, subst_vars from distutils.util import convert_path, subst_vars
...@@ -1149,6 +1149,10 @@ See the setuptools documentation for the "develop" command for more info. ...@@ -1149,6 +1149,10 @@ See the setuptools documentation for the "develop" command for more info.
chmod(f, mode) chmod(f, mode)
def byte_compile(self, to_compile): def byte_compile(self, to_compile):
if _dont_write_bytecode:
self.warn('byte-compiling is disabled, skipping.')
return
from distutils.util import byte_compile from distutils.util import byte_compile
try: try:
# try to make the byte compile messages quieter # try to make the byte compile messages quieter
......
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