[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (asyncio)

victor.stinner python-checkins at python.org
Fri Jan 30 00:17:48 CET 2015


https://hg.python.org/cpython/rev/7e6340e67618
changeset:   94384:7e6340e67618
parent:      94382:c7f7270fbce7
parent:      94383:dadc372f46fa
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Fri Jan 30 00:16:31 2015 +0100
summary:
  Merge 3.4 (asyncio)

files:
  Lib/asyncio/base_subprocess.py |  2 +-
  Lib/asyncio/subprocess.py      |  2 +-
  Lib/asyncio/unix_events.py     |  2 +-
  Lib/asyncio/windows_events.py  |  2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py
--- a/Lib/asyncio/base_subprocess.py
+++ b/Lib/asyncio/base_subprocess.py
@@ -208,7 +208,7 @@
                 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
--- a/Lib/asyncio/subprocess.py
+++ b/Lib/asyncio/subprocess.py
@@ -115,7 +115,7 @@
         """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
--- a/Lib/asyncio/unix_events.py
+++ b/Lib/asyncio/unix_events.py
@@ -188,7 +188,7 @@
                 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
--- a/Lib/asyncio/windows_events.py
+++ b/Lib/asyncio/windows_events.py
@@ -375,7 +375,7 @@
             yield from waiter
         except:
             transp.close()
-            yield from transp.wait()
+            yield from transp._wait()
             raise
 
         return transp

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list