1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00

Vendor distro==0.6.0 (#3906)

To avoid DeprecationWarning for platform.linux_distribution()

Closes #3823
This commit is contained in:
Xavier Fernandez 2016-08-12 15:51:44 +02:00 committed by Donald Stufft
parent 54cf5de4b0
commit fc4109eb1d
4 changed files with 1048 additions and 5 deletions

View file

@ -64,6 +64,7 @@ if DEBUNDLED:
vendored("cachecontrol")
vendored("colorama")
vendored("distlib")
vendored("distro")
vendored("html5lib")
vendored("lockfile")
vendored("six")

1040
pip/_vendor/distro.py Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,5 @@
distlib==0.2.3
distro==0.6.0
html5lib==1.0b8
six==1.10.0
colorama==0.3.7

View file

@ -37,6 +37,7 @@ from pip.utils.glibc import libc_ver
from pip.utils.ui import DownloadProgressBar, DownloadProgressSpinner
from pip.locations import write_delete_marker_file
from pip.vcs import vcs
from pip._vendor import distro
from pip._vendor import requests, six
from pip._vendor.requests.adapters import BaseAdapter, HTTPAdapter
from pip._vendor.requests.auth import AuthBase, HTTPBasicAuth
@ -89,18 +90,18 @@ def user_agent():
data["implementation"]["version"] = platform.python_version()
if sys.platform.startswith("linux"):
distro = dict(filter(
distro_infos = dict(filter(
lambda x: x[1],
zip(["name", "version", "id"], platform.linux_distribution()),
zip(["name", "version", "id"], distro.linux_distribution()),
))
libc = dict(filter(
lambda x: x[1],
zip(["lib", "version"], libc_ver()),
))
if libc:
distro["libc"] = libc
if distro:
data["distro"] = distro
distro_infos["libc"] = libc
if distro_infos:
data["distro"] = distro_infos
if sys.platform.startswith("darwin") and platform.mac_ver()[0]:
data["distro"] = {"name": "OS X", "version": platform.mac_ver()[0]}