Always use Python 3 version of map

18 files changed, 26 insertions, 7 deletions

diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
index 7becc951..8382571e 100644
--- a/pkg_resources/__init__.py
+++ b/pkg_resources/__init__.py
@@ -46,7 +46,7 @@ except ImportError:
     import imp as _imp
 
 from pkg_resources.extern import six
-from pkg_resources.extern.six.moves import urllib
+from pkg_resources.extern.six.moves import urllib, map
 
 # capture these to bypass sandboxing
 from os import utime
diff --git a/pkg_resources/tests/test_pkg_resources.py b/pkg_resources/tests/test_pkg_resources.py
index 31eee635..8b276ffc 100644
--- a/pkg_resources/tests/test_pkg_resources.py
+++ b/pkg_resources/tests/test_pkg_resources.py
@@ -12,6 +12,8 @@ import stat
 import distutils.dist
 import distutils.command.install_egg_info
 
+from pkg_resources.extern.six.moves import map
+
 import pytest
 
 import pkg_resources
diff --git a/pkg_resources/tests/test_resources.py b/pkg_resources/tests/test_resources.py
index 4241765a..84133a32 100644
--- a/pkg_resources/tests/test_resources.py
+++ b/pkg_resources/tests/test_resources.py
@@ -4,6 +4,8 @@ import tempfile
 import shutil
 import string
 
+from pkg_resources.extern.six.moves import map
+
 import pytest
 from pkg_resources.extern import packaging
 
@@ -158,7 +160,7 @@ class TestDistro:
         for i in range(3):
             targets = list(ws.resolve(parse_requirements("Foo"), ad))
             assert targets == [Foo]
-            list(map(ws.add,targets))
+            list(map(ws.add, targets))
         with pytest.raises(VersionConflict):
             ws.resolve(parse_requirements("Foo==0.9"), ad)
         ws = WorkingSet([]) # reset
diff --git a/setuptools/__init__.py b/setuptools/__init__.py
index ec0d5dc2..67b57e4f 100644
--- a/setuptools/__init__.py
+++ b/setuptools/__init__.py
@@ -8,7 +8,7 @@ from distutils.core import Command as _Command
 from distutils.util import convert_path
 from fnmatch import fnmatchcase
 
-from setuptools.extern.six.moves import filterfalse
+from setuptools.extern.six.moves import filterfalse, map
 
 import setuptools.version
 from setuptools.extension import Extension
diff --git a/setuptools/command/alias.py b/setuptools/command/alias.py
index 452a9244..4532b1cc 100755
--- a/setuptools/command/alias.py
+++ b/setuptools/command/alias.py
@@ -1,5 +1,7 @@
 from distutils.errors import DistutilsOptionError
 
+from setuptools.extern.six.moves import map
+
 from setuptools.command.setopt import edit_config, option_base, config_file
 
 
diff --git a/setuptools/command/build_py.py b/setuptools/command/build_py.py
index 0c1026aa..8623c777 100644
--- a/setuptools/command/build_py.py
+++ b/setuptools/command/build_py.py
@@ -9,6 +9,7 @@ import distutils.errors
 import collections
 import itertools
 
+from setuptools.extern.six.moves import map
 
 try:
     from setuptools.lib2to3_ex import Mixin2to3
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index a11618d1..d3c0acfb 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -41,7 +41,7 @@ import shlex
 import io
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import configparser
+from setuptools.extern.six.moves import configparser, map
 
 from setuptools import Command
 from setuptools.sandbox import run_setup
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 18a3105f..d1bd9b04 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -15,6 +15,7 @@ import warnings
 import time
 
 from setuptools.extern import six
+from setuptools.extern.six.moves import map
 
 from setuptools import Command
 from setuptools.command.sdist import sdist
diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index fd0f118b..f777538f 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -1,6 +1,8 @@
 from distutils import log, dir_util
 import os
 
+from setuptools.extern.six.moves import map
+
 from setuptools import Command
 from setuptools.archive_util import unpack_archive
 import pkg_resources
diff --git a/setuptools/command/test.py b/setuptools/command/test.py
index 3a2a9b93..371e913b 100644
--- a/setuptools/command/test.py
+++ b/setuptools/command/test.py
@@ -3,6 +3,7 @@ from unittest import TestLoader
 import sys
 
 from setuptools.extern import six
+from setuptools.extern.six.moves import map
 
 from pkg_resources import (resource_listdir, resource_exists, normalize_path,
                            working_set, _namespace_packages,
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 4964a9e8..77855415 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -14,6 +14,7 @@ from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
     DistutilsSetupError)
 
 from setuptools.extern import six
+from setuptools.extern.six.moves import map
 from pkg_resources.extern import packaging
 
 from setuptools.depends import Require
diff --git a/setuptools/extension.py b/setuptools/extension.py
index 35eb7c7c..d10609b6 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -5,6 +5,8 @@ import distutils.core
 import distutils.errors
 import distutils.extension
 
+from setuptools.extern.six.moves import map
+
 from .dist import _get_unpatched
 from . import msvc9_support
 
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index ea136c09..c53343e4 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -15,7 +15,7 @@ except ImportError:
     from urllib2 import splituser
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import urllib, http_client, configparser
+from setuptools.extern.six.moves import urllib, http_client, configparser, map
 
 from pkg_resources import (
     CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 37035f37..668bcac7 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -9,7 +9,7 @@ import contextlib
 import pickle
 
 from setuptools.extern import six
-from setuptools.extern.six.moves import builtins
+from setuptools.extern.six.moves import builtins, map
 
 import pkg_resources
 
diff --git a/setuptools/ssl_support.py b/setuptools/ssl_support.py
index 7baedd19..511d2fa8 100644
--- a/setuptools/ssl_support.py
+++ b/setuptools/ssl_support.py
@@ -3,7 +3,7 @@ import socket
 import atexit
 import re
 
-from setuptools.extern.six.moves import urllib, http_client
+from setuptools.extern.six.moves import urllib, http_client, map
 
 import pkg_resources
 from pkg_resources import ResolutionError, ExtractionError
diff --git a/setuptools/tests/test_dist_info.py b/setuptools/tests/test_dist_info.py
index 6d0ab587..abd0a763 100644
--- a/setuptools/tests/test_dist_info.py
+++ b/setuptools/tests/test_dist_info.py
@@ -4,6 +4,8 @@ import os
 import shutil
 import tempfile
 
+from setuptools.extern.six.moves import map
+
 import pytest
 
 import pkg_resources
diff --git a/setuptools/tests/test_egg_info.py b/setuptools/tests/test_egg_info.py
index 333d11d6..7d51585b 100644
--- a/setuptools/tests/test_egg_info.py
+++ b/setuptools/tests/test_egg_info.py
@@ -1,6 +1,8 @@
 import os
 import stat
 
+from setuptools.extern.six.moves import map
+
 import pytest
 
 from . import environment
diff --git a/setuptools/tests/test_sdist.py b/setuptools/tests/test_sdist.py
index 753b507d..d2a1f1bb 100644
--- a/setuptools/tests/test_sdist.py
+++ b/setuptools/tests/test_sdist.py
@@ -10,6 +10,7 @@ import contextlib
 import io
 
 from setuptools.extern import six
+from setuptools.extern.six.moves import map
 
 import pytest