From 606b8fb55059ad29d1d31709686f43f17e03642c Mon Sep 17 00:00:00 2001 From: Victor Lin Date: Thu, 23 Oct 2014 15:06:51 -0700 Subject: Fix #277, data files in symbol link directory are not included issue --HG-- branch : bugfix-277 --- setuptools/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setuptools/__init__.py') diff --git a/setuptools/__init__.py b/setuptools/__init__.py index d99ab2a6..6c51072d 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -139,7 +139,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: -- cgit v1.2.1 From ea346ec92092e3bd8d8c07f0522de5e9d1081f00 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 25 Oct 2014 20:13:53 -0400 Subject: Remove Python 2.5 compatibility for sys.dont_write_bytecode --- setuptools/__init__.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'setuptools/__init__.py') 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"))) -- cgit v1.2.1