summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2020-02-16 11:28:47 -0500
committerMike Frysinger <vapier@google.com>2020-02-18 19:06:02 +0000
commit8f9bf484d816196ec19c859d97a23e9c4592188b (patch)
tree9227ac27155e1b50a8b65a76c11d8a10dac553c7
parent37f28f1b4e6783c4a06e21977f2e30d592e13819 (diff)
downloadgit-repo-8f9bf484d816196ec19c859d97a23e9c4592188b.tar.gz
platform_utils: have Windows select stream return "" at EOF
This matches *NIX behavior where the last read is '', not None. Bug: https://crbug.com/gerrit/12329 Change-Id: I48b026b4d1b8d7c6abbce198757b970931869e1a Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/255352 Reviewed-by: David Pursehouse <dpursehouse@collab.net> Tested-by: Mike Frysinger <vapier@google.com>
-rw-r--r--platform_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/platform_utils.py b/platform_utils.py
index 490ba208..f1da75eb 100644
--- a/platform_utils.py
+++ b/platform_utils.py
@@ -179,7 +179,7 @@ class _FileDescriptorStreamsThreads(FileDescriptorStreams):
179 for line in iter(self.fd.readline, b''): 179 for line in iter(self.fd.readline, b''):
180 self.queue.put(_FileDescriptorStreamsThreads.QueueItem(self, line)) 180 self.queue.put(_FileDescriptorStreamsThreads.QueueItem(self, line))
181 self.fd.close() 181 self.fd.close()
182 self.queue.put(_FileDescriptorStreamsThreads.QueueItem(self, None)) 182 self.queue.put(_FileDescriptorStreamsThreads.QueueItem(self, b''))
183 183
184 184
185def symlink(source, link_name): 185def symlink(source, link_name):