diff options
| author | marmeladema <xademax@gmail.com> | 2019-10-20 19:50:44 +0100 |
|---|---|---|
| committer | marmeladema <xademax@gmail.com> | 2019-10-20 23:56:46 +0100 |
| commit | 4d6f28df3563878188406c375650620378200715 (patch) | |
| tree | 31077f9c52d78369011d27f82b3c818eea638d41 /python/servo/command_base.py | |
| parent | 0aa6314ee29fcacc44e7f4401733857b3264d3be (diff) | |
| download | servo-4d6f28df3563878188406c375650620378200715.tar.gz servo-4d6f28df3563878188406c375650620378200715.zip | |
Use linux_distribution() from distro package instead of builtin platform module
platform.linux_distribution() is deprecated since Python 3.5 and
will be removed with Python 3.8.
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index d7b9b26dee9..51fa4bc4b5a 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -18,10 +18,12 @@ import locale import os from os import path import platform +import distro import re import contextlib import subprocess from subprocess import PIPE +import six import sys import tarfile import zipfile @@ -679,8 +681,10 @@ install them, let us know by filing a bug!") append_to_path_env(path.join(libpath, "pkgconfig"), env, "PKG_CONFIG_PATH") if sys.platform == "linux2": - distro, version, _ = platform.linux_distribution() - if distro == "Ubuntu" and (version == "16.04" or version == "14.04"): + distrib, version, _ = distro.linux_distribution() + distrib = six.ensure_str(distrib) + version = six.ensure_str(version) + if distrib == "Ubuntu" and (version == "16.04" or version == "14.04"): env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true" if extra_path: |