aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/__init__.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-11-16 09:40:21 -0500
committerJason R. Coombs <jaraco@jaraco.com>2014-11-16 09:40:21 -0500
commit4d4dbd3c5c69f63418ca2f22e9d6a3b8185b2e00 (patch)
tree01f6619f3630594bb677a10e4406fd822e9f6c26 /setuptools/__init__.py
parentc5fa038292a9c7d6fe529c4d8001cec0d3bac9cf (diff)
parent2c33dad04fd11ebd7fc8e15d0017ff2dc617e6a3 (diff)
downloadexternal_python_setuptools-4d4dbd3c5c69f63418ca2f22e9d6a3b8185b2e00.tar.gz
external_python_setuptools-4d4dbd3c5c69f63418ca2f22e9d6a3b8185b2e00.tar.bz2
external_python_setuptools-4d4dbd3c5c69f63418ca2f22e9d6a3b8185b2e00.zip
Merge with master
--HG-- branch : feature/issue-229
Diffstat (limited to 'setuptools/__init__.py')
-rw-r--r--setuptools/__init__.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index 68bea4f6..920dad38 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -140,7 +140,7 @@ def findall(dir = os.curdir):
(relative to 'dir').
"""
all_files = []
- for base, dirs, files in os.walk(dir):
+ for base, dirs, files in os.walk(dir, followlinks=True):
if base==os.curdir or base.startswith(os.curdir+os.sep):
base = base[2:]
if base:
@@ -149,7 +149,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")))