diff options
| author | Éric Araujo <merwok@netwok.org> | 2012-02-10 05:20:53 +0100 |
|---|---|---|
| committer | Éric Araujo <merwok@netwok.org> | 2012-02-10 05:20:53 +0100 |
| commit | 9f90a731eb9a09e9e2fc022800475ff22206ac01 (patch) | |
| tree | 9d026480d581f750298603d300bc053e8fce745f /Lib/packaging/pypi/simple.py | |
| parent | ea0b1edf45c5fa33163fa59f33849029cd58c9e1 (diff) | |
| download | cpython-git-9f90a731eb9a09e9e2fc022800475ff22206ac01.tar.gz | |
Use sys.version_info instead of sys.version in packaging.
The contents of this attribute are an implementation detail, as
documented for #9442, so we should not parse it, to support non-CPython
VMs with distutils2 in the future.
Unfortunately, one use comes directly from PEP 345, so an edit will have
to be agreed before fixing the code (see comment in p7g.markers).
Other remaining uses are found in p7g.compiler and could be replaced by
the platform module (which also parses sys.version, but then it wouldn’t
be my fault :)
Diffstat (limited to 'Lib/packaging/pypi/simple.py')
| -rw-r--r-- | Lib/packaging/pypi/simple.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/packaging/pypi/simple.py b/Lib/packaging/pypi/simple.py index 44d98e10e5..e26d55d002 100644 --- a/Lib/packaging/pypi/simple.py +++ b/Lib/packaging/pypi/simple.py @@ -35,8 +35,8 @@ __all__ = ['Crawler', 'DEFAULT_SIMPLE_INDEX_URL'] DEFAULT_SIMPLE_INDEX_URL = "http://a.pypi.python.org/simple/" DEFAULT_HOSTS = ("*",) SOCKET_TIMEOUT = 15 -USER_AGENT = "Python-urllib/%s packaging/%s" % ( - sys.version[:3], packaging_version) +USER_AGENT = "Python-urllib/%s.%s packaging/%s" % ( + sys.version_info[0], sys.version_info[1], packaging_version) # -- Regexps ------------------------------------------------- EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$') |