diff options
author | William Deegan <bill@baddogconsulting.com> | 2017-03-12 21:41:09 (GMT) |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2017-03-12 21:41:09 (GMT) |
commit | 462c39afe68bd7e936eb86e094c777242ad9764f (patch) | |
tree | 960019f41b92279d4d057532ca21a7d0ed50c49e /QMTest | |
parent | cc31754c1f74e8f6206329f6b267660cfc72c993 (diff) | |
download | SCons-462c39afe68bd7e936eb86e094c777242ad9764f.zip SCons-462c39afe68bd7e936eb86e094c777242ad9764f.tar.gz SCons-462c39afe68bd7e936eb86e094c777242ad9764f.tar.bz2 |
Remove check for subprocess.mswindows used to detect running on windows py2/3
Diffstat (limited to 'QMTest')
-rw-r--r-- | QMTest/TestCmd.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py index 96e07a9..e76b2e3 100644 --- a/QMTest/TestCmd.py +++ b/QMTest/TestCmd.py @@ -499,7 +499,7 @@ def match_re(lines = None, res = None): msg = "Regular expression error in %s: %s" raise re.error(msg % (repr(s), e.args[0])) if not expr.search(lines[i]): - print("match_re: mismatch at line %d:\n search re='%s'\n line='%s'"%(i,s,lines[i])) + print("match_re: mismatch at line %d:\n search re='%s'\n line='%s'"%(i, s, lines[i])) return return 1 @@ -672,7 +672,7 @@ except AttributeError: PIPE = subprocess.PIPE -if sys.platform == 'win32' and subprocess.mswindows: +if sys.platform == 'win32':# and subprocess.mswindows: try: from win32file import ReadFile, WriteFile from win32pipe import PeekNamedPipe @@ -734,7 +734,7 @@ class Popen(subprocess.Popen): getattr(self, which).close() setattr(self, which, None) - if sys.platform == 'win32' and subprocess.mswindows: + if sys.platform == 'win32':# and subprocess.mswindows: def send(self, input): if not self.stdin: return None |