[Python-checkins] cpython (merge 3.4 -> default): Merge: Apply asyncio Task English fixes to docstrings as well.

Wed Sep 24 19:15:15 CEST 2014

https://hg.python.org/cpython/rev/b18288f24501
changeset: 92566:b18288f24501
parent: 92564:63fcc08ee8cc
parent: 92565:132e2fe31d9f
user: R David Murray <rdmurray at bitdance.com>
date: Wed Sep 24 13:14:07 2014 -0400
summary:
 Merge: Apply asyncio Task English fixes to docstrings as well.
files:
 Lib/asyncio/tasks.py | 19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -77,9 +77,9 @@
 # status is still pending
 self._log_destroy_pending = True
 
- # On Python 3.3 or older, objects with a destructor part of a reference
- # cycle are never destroyed. It's not more the case on Python 3.4 thanks to
- # the PEP 442.
+ # On Python 3.3 or older, objects with a destructor that are part of a
+ # reference cycle are never destroyed. That's not the case any more on
+ # Python 3.4 thanks to the PEP 442.
 if _PY34:
 def __del__(self):
 if self._state == futures._PENDING and self._log_destroy_pending:
@@ -155,7 +155,8 @@
 This produces output similar to that of the traceback module,
 for the frames retrieved by get_stack(). The limit argument
 is passed to get_stack(). The file argument is an I/O stream
- to which the output goes; by default it goes to sys.stderr.
+ to which the output is written; by default output is written
+ to sys.stderr.
 """
 extracted_list = []
 checked = set()
@@ -184,18 +185,18 @@
 print(line, file=file, end='')
 
 def cancel(self):
- """Request this task to cancel itself.
+ """Request that this task cancel itself.
 
 This arranges for a CancelledError to be thrown into the
 wrapped coroutine on the next cycle through the event loop.
 The coroutine then has a chance to clean up or even deny
 the request using try/except/finally.
 
- Contrary to Future.cancel(), this does not guarantee that the
+ Unlike Future.cancel, this does not guarantee that the
 task will be cancelled: the exception might be caught and
- acted upon, delaying cancellation of the task or preventing it
- completely. The task may also return a value or raise a
- different exception.
+ acted upon, delaying cancellation of the task or preventing
+ cancellation completely. The task may also return a value or
+ raise a different exception.
 
 Immediately after this method is called, Task.cancelled() will
 not return True (unless the task was already cancelled). A
-- 
Repository URL: https://hg.python.org/cpython
