summaryrefslogtreecommitdiff
path: root/QMTest
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-03-12 17:41:09 -0400
committerWilliam Deegan <bill@baddogconsulting.com>2017-03-12 17:41:09 -0400
commit164d1f1995f7b35d5057ce83d4ece2e3e31221c6 (patch)
tree960019f41b92279d4d057532ca21a7d0ed50c49e /QMTest
parent8212af143bf1eabdef3bf3acb62409f2b141f016 (diff)
downloadscons-164d1f1995f7b35d5057ce83d4ece2e3e31221c6.tar.gz
Remove check for subprocess.mswindows used to detect running on windows py2/3
Diffstat (limited to 'QMTest')
-rw-r--r--QMTest/TestCmd.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/QMTest/TestCmd.py b/QMTest/TestCmd.py
index 96e07a98..e76b2e31 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