diff options
| author | Steve Kowalik <steven@wedontsleep.org> | 2016-02-16 16:01:54 +1100 |
|---|---|---|
| committer | Steve Kowalik <steven@wedontsleep.org> | 2016-02-16 16:01:54 +1100 |
| commit | 69175b941a74a4e2f37b856437b3ca20bc2f240a (patch) | |
| tree | e0349b731b724c76963f9fd429f53b22cbf142d3 /setuptools/package_index.py | |
| parent | 43d0308ad6a8c83be645b09e8c1871b36ff3c4c9 (diff) | |
| parent | 8ccd428cd2a733891bffce13e017774ea82bd8d2 (diff) | |
| download | external_python_setuptools-69175b941a74a4e2f37b856437b3ca20bc2f240a.tar.gz external_python_setuptools-69175b941a74a4e2f37b856437b3ca20bc2f240a.tar.bz2 external_python_setuptools-69175b941a74a4e2f37b856437b3ca20bc2f240a.zip | |
Merge from master, resolving conflicts.
Diffstat (limited to 'setuptools/package_index.py')
| -rwxr-xr-x | setuptools/package_index.py | 2 |
1 files changed, 1 insertions, 1 deletions
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, |