Use newer string formatting for rendering user agent. Re-use __version__ from main package.

1 files changed, 6 insertions, 3 deletions

diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 567ab53a..e87504db 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -17,6 +17,7 @@ except ImportError:
 from setuptools.extern import six
 from setuptools.extern.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,
@@ -46,6 +47,11 @@ __all__ = [
 
 _SOCKET_TIMEOUT = 15
 
+
+_tmpl = "setuptools/{setuptools.__version__} Python-urllib/{py_major}"
+user_agent = _tmpl.format(py_major=sys.version[:3], **globals())
+
+
 def parse_bdist_wininst(name):
     """Return (base,pyversion) or (None,None) for possible .exe name"""
 
@@ -202,9 +208,6 @@ def find_external_links(url, page):
             if match:
                 yield urllib.parse.urljoin(url, htmldecode(match.group(1)))
 
-user_agent = "setuptools/%s Python-urllib/%s" % (
-    require('setuptools')[0].version, sys.version[:3],
-)
 
 class ContentChecker(object):
     """