From d36e430aa44b032781f2fcab16d60b1e0357692e Mon Sep 17 00:00:00 2001 From: ajohns Date: Tue, 22 Sep 2020 14:09:07 +1000 Subject: [PATCH] fix regression --- src/rez/utils/_version.py | 2 +- src/rez/utils/execution.py | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/rez/utils/_version.py b/src/rez/utils/_version.py index 9894dd986..aae5294e3 100644 --- a/src/rez/utils/_version.py +++ b/src/rez/utils/_version.py @@ -1,7 +1,7 @@ # Update this value to version up Rez. Do not place anything else in this file. -_rez_version = "2.68.2" +_rez_version = "2.68.3" # Copyright 2013-2016 Allan Johns. diff --git a/src/rez/utils/execution.py b/src/rez/utils/execution.py index 99aeb87ea..3692922b2 100644 --- a/src/rez/utils/execution.py +++ b/src/rez/utils/execution.py @@ -64,17 +64,18 @@ def __init__(self, args, **kwargs): # text = kwargs.pop("text", None) universal_newlines = kwargs.pop("universal_newlines", None) + if text or universal_newlines: kwargs["universal_newlines"] = True - # fixes py3/cmd.exe UnicodeDecodeError() with some characters. - # UnicodeDecodeError: 'charmap' codec can't decode byte - # 0x8d in position 1023172: character maps to - # - # NOTE: currently no solution for `python3+<3.6` - # - if sys.version_info[:2] >= (3, 6) and "encoding" not in kwargs: - kwargs["encoding"] = "utf-8" + # fixes py3/cmd.exe UnicodeDecodeError() with some characters. + # UnicodeDecodeError: 'charmap' codec can't decode byte + # 0x8d in position 1023172: character maps to + # + # NOTE: currently no solution for `python3+<3.6` + # + if sys.version_info[:2] >= (3, 6) and "encoding" not in kwargs: + kwargs["encoding"] = "utf-8" super(Popen, self).__init__(args, **kwargs)