diff --git a/src/python/grpcio_tests/tests/_runner.py b/src/python/grpcio_tests/tests/_runner.py index 06f5d88fc3d..2cf5fdaaead 100644 --- a/src/python/grpcio_tests/tests/_runner.py +++ b/src/python/grpcio_tests/tests/_runner.py @@ -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(), 'ascii') + return self._into_file.read().encode('ascii') else: return bytes() @@ -80,7 +80,7 @@ class CaptureFile(object): value (str): What to write to the original file. """ if six.PY3 and not isinstance(value, six.binary_type): - value = bytes(value, 'ascii') + value = value.encode('ascii') if self._saved_fd is None: os.write(self._redirect_fd, value) else: diff --git a/tools/run_tests/python_utils/port_server.py b/tools/run_tests/python_utils/port_server.py index 04619a5c894..64d6c903046 100755 --- a/tools/run_tests/python_utils/port_server.py +++ b/tools/run_tests/python_utils/port_server.py @@ -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, 'ascii')) + self.wfile.write(str(p).encode('ascii')) 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, 'ascii')) + self.wfile.write(str(_MY_VERSION).encode('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, 'ascii')) + self.wfile.write(out.encode('ascii')) elif self.path == '/quitquitquit': self.send_response(200) self.end_headers()