summaryrefslogtreecommitdiff
path: root/setuptools/__init__.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-01-16 15:04:47 -0500
committerJason R. Coombs <jaraco@jaraco.com>2017-01-16 15:04:47 -0500
commitc80f03bed382c523778c196f93616a04d3d8aa0c (patch)
tree91979531ac09a830ec35be92125b285503ba4d80 /setuptools/__init__.py
parente6087bfa308ee6b45c2c1906af1a7f4a177cb57b (diff)
parent730834b5c286b5ba2091394339d0759035804eba (diff)
downloadpython-setuptools-git-c80f03bed382c523778c196f93616a04d3d8aa0c.tar.gz
Merge with master
Diffstat (limited to 'setuptools/__init__.py')
-rw-r--r--setuptools/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index c60e1eab..d01918ed 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -7,7 +7,7 @@ import distutils.filelist
from distutils.util import convert_path
from fnmatch import fnmatchcase
-from six.moves import filter, filterfalse, map
+from six.moves import filter, map
import setuptools.version
from setuptools.extension import Extension