From 8a4809f7c232a18d3192798c2e583726304efd4b Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 21 Mar 2014 22:46:59 -0400 Subject: Perform the inclusion filter after traversal for congruency with exclude --- setuptools/__init__.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'setuptools/__init__.py') diff --git a/setuptools/__init__.py b/setuptools/__init__.py index 8f0887c6..9d06d627 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -63,9 +63,10 @@ def find_packages(where='.', exclude=(), include=('*',)): ) if looks_like_package: pkg_name = prefix + name - if any(fnmatchcase(pkg_name, pat) for pat in include): - out.append(pkg_name) - stack.append((fn, pkg_name + '.')) + out.append(pkg_name) + stack.append((fn, pkg_name + '.')) + for pat in include: + out = [item for item in out if fnmatchcase(item,pat)] for pat in exclude: out = [item for item in out if not fnmatchcase(item,pat)] return out -- cgit v1.2.1