diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-11-22 04:28:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-22 04:28:19 +0200 |
| commit | d27bad7d6d118cdb5a007d6efd743a8c9d48f683 (patch) | |
| tree | 9a471cd5d458ed7b559efd6475d56c2bbab5c13a /mesonbuild/mesonlib.py | |
| parent | 15bbf1ea7581a8a872296435b28d679c7e42a466 (diff) | |
| parent | 5c602b5457bba915ad560f141e9c2b8c9ca1e7ec (diff) | |
| download | meson-d27bad7d6d118cdb5a007d6efd743a8c9d48f683.zip meson-d27bad7d6d118cdb5a007d6efd743a8c9d48f683.tar.gz meson-d27bad7d6d118cdb5a007d6efd743a8c9d48f683.tar.bz2 | |
Merge pull request #8011 from dcbaker/submit/post-python36-cleanups
Python 3.6 cleanups
Diffstat (limited to 'mesonbuild/mesonlib.py')
| -rw-r--r-- | mesonbuild/mesonlib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index 352c5ca..921a337 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -13,7 +13,7 @@ # limitations under the License. """A library of random helper functionality.""" -from ._pathlib import Path +from pathlib import Path import sys import stat import time @@ -1211,7 +1211,7 @@ def Popen_safe(args: T.List[str], write: T.Optional[str] = None, # up the console and ANSI colors will stop working on Windows. if 'stdin' not in kwargs: kwargs['stdin'] = subprocess.DEVNULL - if sys.version_info < (3, 6) or not sys.stdout.encoding or encoding.upper() != 'UTF-8': + if not sys.stdout.encoding or encoding.upper() != 'UTF-8': p, o, e = Popen_safe_legacy(args, write=write, stdout=stdout, stderr=stderr, **kwargs) else: p = subprocess.Popen(args, universal_newlines=True, close_fds=False, |