tools: make pty_helper.py python3-compatible

bnoordhuis · targos · commit acdc21b8329d · 2019-08-20T09:10:14.000+02:00
Fixes: #29166 PR-URL: #29167 Reviewed-By: Sam Roberts <vieuxtech@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/test/pseudo-tty/pty_helper.py b/test/pseudo-tty/pty_helper.py
@@ -25,8 +25,12 @@ def pipe(sfd, dfd):
   if dfd == STDOUT:
     # Work around platform quirks. Some platforms echo ^D as \x04
     # (AIX, BSDs) and some don't (Linux).
-    filt = lambda c: ord(c) > 31 or c in '\t\n\r\f'
+    #
+    # The comparison against b' '[0] is because |data| is
+    # a string in python2 but a bytes object in python3.
+    filt = lambda c: c >= b' '[0] or c in b'\t\n\r\f'
     data = filter(filt, data)
+    data = bytes(data)
 
   while data:
     try:
