aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/package_index.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/package_index.py
parente6087bfa308ee6b45c2c1906af1a7f4a177cb57b (diff)
parent730834b5c286b5ba2091394339d0759035804eba (diff)
downloadexternal_python_setuptools-c80f03bed382c523778c196f93616a04d3d8aa0c.tar.gz
external_python_setuptools-c80f03bed382c523778c196f93616a04d3d8aa0c.tar.bz2
external_python_setuptools-c80f03bed382c523778c196f93616a04d3d8aa0c.zip
Merge with master
Diffstat (limited to 'setuptools/package_index.py')
-rwxr-xr-xsetuptools/package_index.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 65c3c433..42361058 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -20,7 +20,7 @@ from six.moves import urllib, http_client, configparser, map
import setuptools
from pkg_resources import (
CHECKOUT_DIST, Distribution, BINARY_DIST, normalize_path, SOURCE_DIST,
- require, Environment, find_distributions, safe_name, safe_version,
+ Environment, find_distributions, safe_name, safe_version,
to_filename, Requirement, DEVELOP_DIST,
)
from setuptools import ssl_support
@@ -48,7 +48,7 @@ __all__ = [
_SOCKET_TIMEOUT = 15
_tmpl = "setuptools/{setuptools.__version__} Python-urllib/{py_major}"
-user_agent = _tmpl.format(py_major=sys.version[:3], **globals())
+user_agent = _tmpl.format(py_major=sys.version[:3], setuptools=setuptools)
def parse_requirement_arg(spec):