aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-10-25 20:13:53 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-10-25 20:13:53 -0400
commitea346ec92092e3bd8d8c07f0522de5e9d1081f00 (patch)
tree7cf326a4ec7f3c288f640514e5fd6714d8a28306
parentcfe069fde688bbf2a3cf70a638ae24e2e9f7cbf4 (diff)
downloadexternal_python_setuptools-ea346ec92092e3bd8d8c07f0522de5e9d1081f00.tar.gz
external_python_setuptools-ea346ec92092e3bd8d8c07f0522de5e9d1081f00.tar.bz2
external_python_setuptools-ea346ec92092e3bd8d8c07f0522de5e9d1081f00.zip
Remove Python 2.5 compatibility for sys.dont_write_bytecode
-rw-r--r--setuptools/__init__.py4
-rwxr-xr-xsetuptools/command/easy_install.py4
2 files changed, 2 insertions, 6 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 6c51072d..ca025c30 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -148,7 +148,3 @@ def findall(dir = os.curdir):
return all_files
distutils.filelist.findall = findall # fix findall bug in distutils.
-
-# sys.dont_write_bytecode was introduced in Python 2.6.
-_dont_write_bytecode = getattr(sys, 'dont_write_bytecode',
- bool(os.environ.get("PYTHONDONTWRITEBYTECODE")))
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index 68548272..2e00b996 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -35,7 +35,7 @@ import warnings
import site
import struct
-from setuptools import Command, _dont_write_bytecode
+from setuptools import Command
from setuptools.sandbox import run_setup
from setuptools.py31compat import get_path, get_config_vars
from setuptools.command import setopt
@@ -1152,7 +1152,7 @@ See the setuptools documentation for the "develop" command for more info.
chmod(f, mode)
def byte_compile(self, to_compile):
- if _dont_write_bytecode:
+ if sys.dont_write_bytecode:
self.warn('byte-compiling is disabled, skipping.')
return