natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitly set encoding to ascii to prevent TypeError in 3.7+

This commit is contained in:
Lidi Zheng 2020-11-11 14:14:13 -08:00
parent 2ebd3c3c02
commit 892e7bacb1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/python/grpcio_tests/tests/_runner.py
View File

@ -59,7 +59,7 @@ class CaptureFile(object):
"""Get all output from the redirected-to file if it exists."""
if self._into_file:
self._into_file.seek(0)
return bytes(self._into_file.read())
return bytes(self._into_file.read(), 'ascii')
else:
return bytes()

6
tools/run_tests/python_utils/port_server.py
View File

@ -157,7 +157,7 @@ class Handler(BaseHTTPRequestHandler):
self.end_headers()
p = allocate_port(self)
self.log_message('allocated port %d' % p)
self.wfile.write(bytes('%d' % p))
self.wfile.write(('%d' % p).encode('utf8'))
elif self.path[0:6] == '/drop/':
self.send_response(200)
self.send_header('Content-Type', 'text/plain')
@ -177,7 +177,7 @@ class Handler(BaseHTTPRequestHandler):
self.send_response(200)
self.send_header('Content-Type', 'text/plain')
self.end_headers()
self.wfile.write(bytes('%d' % _MY_VERSION))
self.wfile.write(bytes('%d' % _MY_VERSION, 'ascii'))
elif self.path == '/dump':
# yaml module is not installed on Macs and Windows machines by default
# so we import it lazily (/dump action is only used for debugging)
@ -192,7 +192,7 @@ class Handler(BaseHTTPRequestHandler):
'in_use': dict((k, now - v) for k, v in in_use.items())
})
mu.release()
self.wfile.write(bytes(out))
self.wfile.write(bytes(out, 'ascii'))
elif self.path == '/quitquitquit':
self.send_response(200)
self.end_headers()