_UnixSubprocessTransport._start() now uses the makefile() method when available

3 files changed, 10 insertions, 5 deletions

diff --git a/TODO b/TODO
index b218c0e..f884b45 100644
--- a/TODO
+++ b/TODO
@@ -5,6 +5,7 @@
   - test_queues.py
   - test_tasks.py
 
+* as_completed() is a coroutine or not?
 * Move asyncio/coroutine.py in asyncio/tasks.py?
 * Fix coroutine._DEBUG=True
 * Fix all FIXME in the code
diff --git a/asyncio/tasks.py b/asyncio/tasks.py
index 0538f63..25003bf 100644
--- a/asyncio/tasks.py
+++ b/asyncio/tasks.py
@@ -372,7 +372,6 @@ def _wait(fs, timeout, return_when, loop):
 
 
 # This is *not* a @coroutine!  It is just an iterator (yielding Futures).
-# FIXME: @coroutine
 def as_completed(fs, loop=None, timeout=None):
     """Return an iterator whose values, when waited for, are Futures.
 
diff --git a/asyncio/unix_events.py b/asyncio/unix_events.py
index ab17558..0cfbd5f 100644
--- a/asyncio/unix_events.py
+++ b/asyncio/unix_events.py
@@ -403,10 +403,15 @@ class _UnixSubprocessTransport(base_subprocess.BaseSubprocessTransport):
             universal_newlines=False, bufsize=bufsize, **kwargs)
         if stdin_w is not None:
             stdin.close()
-            # FIXME: use socket.makefile("rb", bufsize)?
-            stdin_dup = os.dup(stdin_w.fileno())
-            stdin_w.close()
-            self._proc.stdin = os.fdopen(stdin_dup, 'rb', bufsize)
+            if hasattr(stdin_w, 'detach'):
+                stdin_fd = stdin_w.detach()
+                self._proc.stdin = os.fdopen(stdin_fd, 'rb', bufsize)
+            elif hasattr(stdin_w, 'makefile'):
+                self._proc.stdin = stdin_w.makefile('rb', bufsize)
+            else:
+                stdin_dup = os.dup(stdin_w.fileno())
+                stdin_w.close()
+                self._proc.stdin = os.fdopen(stdin_dup, 'rb', bufsize)
 
 
 class AbstractChildWatcher(object):