Merge 3.4

This commit is contained in:
Yury Selivanov 2015-11-17 12:02:32 -05:00
commit 7f324ba735
1 changed files with 0 additions and 3 deletions

View File

@ -93,7 +93,6 @@ class Task(futures.Future):
futures.Future.__del__(self)
def _repr_info(self):
# Private method, do not use it.
info = super()._repr_info()
if self._must_cancel:
@ -222,7 +221,6 @@ class Task(futures.Future):
return True
def _step(self, value=None, exc=None):
# Private method, do not use it.
assert not self.done(), \
'_step(): already done: {!r}, {!r}, {!r}'.format(self, value, exc)
if self._must_cancel:
@ -286,7 +284,6 @@ class Task(futures.Future):
self = None # Needed to break cycles when an exception occurs.
def _wakeup(self, future):
# Private method, do not use it.
try:
future.result()
except Exception as exc: