67 lines
2.5 KiB
Diff
67 lines
2.5 KiB
Diff
From 765e7e17975477b4e2fa60256007c970057e018d Mon Sep 17 00:00:00 2001
|
|
From: Lisandro Dalcin <dalcinl@gmail.com>
|
|
Date: Tue, 3 Oct 2017 21:35:10 +0300
|
|
Subject: [PATCH] Make Future.__repr__ subclass-friendly (bpo-22033) (#65)
|
|
|
|
+ https://bugs.python.org/issue22033
|
|
|
|
Minor spelling fixes in docstrings (bpo-25523)
|
|
|
|
+ https://bugs.python.org/issue25523
|
|
---
|
|
concurrent/futures/_base.py | 19 +++++++++++--------
|
|
1 file changed, 11 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/concurrent/futures/_base.py b/concurrent/futures/_base.py
|
|
index ca2ebfb..401e488 100644
|
|
--- a/concurrent/futures/_base.py
|
|
+++ b/concurrent/futures/_base.py
|
|
@@ -322,17 +322,20 @@ class Future(object):
|
|
with self._condition:
|
|
if self._state == FINISHED:
|
|
if self._exception:
|
|
- return '<Future at %s state=%s raised %s>' % (
|
|
- hex(id(self)),
|
|
+ return '<%s at %#x state=%s raised %s>' % (
|
|
+ self.__class__.__name__,
|
|
+ id(self),
|
|
_STATE_TO_DESCRIPTION_MAP[self._state],
|
|
self._exception.__class__.__name__)
|
|
else:
|
|
- return '<Future at %s state=%s returned %s>' % (
|
|
- hex(id(self)),
|
|
+ return '<%s at %#x state=%s returned %s>' % (
|
|
+ self.__class__.__name__,
|
|
+ id(self),
|
|
_STATE_TO_DESCRIPTION_MAP[self._state],
|
|
self._result.__class__.__name__)
|
|
- return '<Future at %s state=%s>' % (
|
|
- hex(id(self)),
|
|
+ return '<%s at %#x state=%s>' % (
|
|
+ self.__class__.__name__,
|
|
+ id(self),
|
|
_STATE_TO_DESCRIPTION_MAP[self._state])
|
|
|
|
def cancel(self):
|
|
@@ -355,7 +358,7 @@ class Future(object):
|
|
return True
|
|
|
|
def cancelled(self):
|
|
- """Return True if the future has cancelled."""
|
|
+ """Return True if the future was cancelled."""
|
|
with self._condition:
|
|
return self._state in [CANCELLED, CANCELLED_AND_NOTIFIED]
|
|
|
|
@@ -573,7 +576,7 @@ class Executor(object):
|
|
raise NotImplementedError()
|
|
|
|
def map(self, fn, *iterables, **kwargs):
|
|
- """Returns a iterator equivalent to map(fn, iter).
|
|
+ """Returns an iterator equivalent to map(fn, iter).
|
|
|
|
Args:
|
|
fn: A callable that will take as many arguments as there are
|
|
--
|
|
2.39.0.windows.2
|
|
|