Replace platform.linux_distribution with distro.linux_distribution (#7337)

Smallest possible fix for #7106 

* Replace platform.linux_dependencies with distro.linux_dependencies

* run build.py

* Add minimum version of 1.0.1

* Pin back requests package

* Update changelog
This commit is contained in:
ohemorange
2019-08-27 18:31:35 -07:00
committed by Brad Warren
parent aaeb4582e2
commit 0fe28a6459
8 changed files with 192 additions and 178 deletions
+2 -2
View File
@@ -520,11 +520,11 @@ class OsInfoTest(unittest.TestCase):
with mock.patch('platform.system_alias',
return_value=('linux', '', '')):
with mock.patch('platform.linux_distribution',
with mock.patch('distro.linux_distribution',
return_value=('', '', '')):
self.assertEqual(get_python_os_info(), ("linux", ""))
with mock.patch('platform.linux_distribution',
with mock.patch('distro.linux_distribution',
return_value=('testdist', '42', '')):
self.assertEqual(get_python_os_info(), ("testdist", "42"))
+3 -2
View File
@@ -14,6 +14,7 @@ import socket
import subprocess
import configargparse
import distro
import six
from acme.magic_typing import Tuple, Union # pylint: disable=unused-import, no-name-in-module
@@ -391,8 +392,8 @@ def get_python_os_info():
os_type, os_ver, _ = info
os_type = os_type.lower()
if os_type.startswith('linux'):
info = platform.linux_distribution()
# On arch, platform.linux_distribution() is reportedly ('','',''),
info = distro.linux_distribution()
# On arch, distro.linux_distribution() is reportedly ('','',''),
# so handle it defensively
if info[0]:
os_type = info[0]