diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2020-02-11 22:15:31 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-02-11 22:15:31 -0500 |
| commit | ce8e3ee174ed9dee84aa08a461fb174ac1e53535 (patch) | |
| tree | da78c024b4491210e61b73e9e2f755d46c8bc1ff /setuptools/package_index.py | |
| parent | 53b8523fdfa19173d2e6b11d6b4d175f54b9dfea (diff) | |
| parent | a5dec2f14e3414e4ee5dd146bff9c289d573de9a (diff) | |
| download | python-setuptools-git-ce8e3ee174ed9dee84aa08a461fb174ac1e53535.tar.gz | |
Merge branch 'master' into fix/1557
Diffstat (limited to 'setuptools/package_index.py')
| -rw-r--r-- | setuptools/package_index.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 6b06f2ca..82eb4516 100644 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -46,7 +46,8 @@ __all__ = [ _SOCKET_TIMEOUT = 15 _tmpl = "setuptools/{setuptools.__version__} Python-urllib/{py_major}" -user_agent = _tmpl.format(py_major=sys.version[:3], setuptools=setuptools) +user_agent = _tmpl.format( + py_major='{}.{}'.format(*sys.version_info), setuptools=setuptools) def parse_requirement_arg(spec): @@ -1092,7 +1093,8 @@ def open_with_auth(url, opener=urllib.request.urlopen): # copy of urllib.parse._splituser from Python 3.8 def _splituser(host): - """splituser('user[:passwd]@host[:port]') --> 'user[:passwd]', 'host[:port]'.""" + """splituser('user[:passwd]@host[:port]') + --> 'user[:passwd]', 'host[:port]'.""" user, delim, host = host.rpartition('@') return (user if delim else None), host |