Merge 3.4 (asyncio)

4 files changed, 4 insertions, 4 deletions

diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py
index 001f9b8..70676ab 100644
--- a/Lib/asyncio/base_subprocess.py
+++ b/Lib/asyncio/base_subprocess.py
@@ -208,7 +208,7 @@ class BaseSubprocessTransport(transports.SubprocessTransport):
                 waiter.set_result(returncode)
         self._exit_waiters = None
 
-    def wait(self):
+    def _wait(self):
         """Wait until the process exit and return the process return code.
 
         This method is a coroutine."""
diff --git a/Lib/asyncio/subprocess.py b/Lib/asyncio/subprocess.py
index d0c9779..4600a9f 100644
--- a/Lib/asyncio/subprocess.py
+++ b/Lib/asyncio/subprocess.py
@@ -115,7 +115,7 @@ class Process:
         """Wait until the process exit and return the process return code.
 
         This method is a coroutine."""
-        return (yield from self._transport.wait())
+        return (yield from self._transport._wait())
 
     def send_signal(self, signal):
         self._transport.send_signal(signal)
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py
index 3ecdfd2..1fc39ab 100644
--- a/Lib/asyncio/unix_events.py
+++ b/Lib/asyncio/unix_events.py
@@ -188,7 +188,7 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop):
                 yield from waiter
             except:
                 transp.close()
-                yield from transp.wait()
+                yield from transp._wait()
                 raise
 
         return transp
diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py
index 437eb0a..c4bffc4 100644
--- a/Lib/asyncio/windows_events.py
+++ b/Lib/asyncio/windows_events.py
@@ -375,7 +375,7 @@ class ProactorEventLoop(proactor_events.BaseProactorEventLoop):
             yield from waiter
         except:
             transp.close()
-            yield from transp.wait()
+            yield from transp._wait()
             raise
 
         return transp