diff options
author | Martin Robinson <mrobinson@igalia.com> | 2023-05-29 13:56:03 +0200 |
---|---|---|
committer | Martin Robinson <mrobinson@igalia.com> | 2023-05-29 13:56:03 +0200 |
commit | faa8c0e967cd9e3526c05e4eac34c679cb14ed5f (patch) | |
tree | 79fb6d27505cf33d185a1a95de93b28b764ee44d /python/servo/platform/linux.py | |
parent | 9a93c218675374eb4d57fa2d55f1bdadb831ac8d (diff) | |
download | servo-faa8c0e967cd9e3526c05e4eac34c679cb14ed5f.tar.gz servo-faa8c0e967cd9e3526c05e4eac34c679cb14ed5f.zip |
Remove more Python 2 compatibility code
- os.environ is always `str` in Python 3.
- The only string type is `str` so we can stop using `six.str_types`.
- `iteritems()` isn't necessary because dicts have the `items()` method.
Diffstat (limited to 'python/servo/platform/linux.py')
-rw-r--r-- | python/servo/platform/linux.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/python/servo/platform/linux.py b/python/servo/platform/linux.py index b4a8c031f37..5aca1a434ec 100644 --- a/python/servo/platform/linux.py +++ b/python/servo/platform/linux.py @@ -13,7 +13,6 @@ import tempfile from typing import Optional, Tuple import distro -import six from .. import util from .base import Base @@ -65,8 +64,8 @@ class Linux(Base): @staticmethod def get_distro_and_version() -> Tuple[str, str]: - distrib = six.ensure_str(distro.name()) - version = six.ensure_str(distro.version()) + distrib = distro.name() + version = distro.version() if distrib in ['LinuxMint', 'Linux Mint', 'KDE neon', 'Pop!_OS']: if '.' in version: |