!21 Make Future.repr subclass-friendly (bpo-22033) (#65)

From: @zhang-liang-pengkun 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li
This commit is contained in:
openeuler-ci-bot 2023-12-28 09:44:29 +00:00 committed by Gitee
commit 19e1da2395
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 71 additions and 1 deletions

View File

@ -0,0 +1,66 @@
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

View File

@ -1,6 +1,6 @@
Name: python-futures Name: python-futures
Version: 3.1.1 Version: 3.1.1
Release: 8 Release: 9
Summary: Backport of the concurrent.futures standard library module to Python 3.2 Summary: Backport of the concurrent.futures standard library module to Python 3.2
License: Python License: Python
URL: https://github.com/agronholm/pythonfutures URL: https://github.com/agronholm/pythonfutures
@ -8,6 +8,7 @@ Source0: https://files.pythonhosted.org/packages/source/f/futures/futures-
Patch01: 0001-Backport-thread_name_prefix-from-upstream-64.patch Patch01: 0001-Backport-thread_name_prefix-from-upstream-64.patch
Patch02: 0002-Specify-python_requires-to-prevent-installation-on-P.patch Patch02: 0002-Specify-python_requires-to-prevent-installation-on-P.patch
Patch03: 0003-Backport-fixes-to-as_completed-and-map-iterators-bpo.patch Patch03: 0003-Backport-fixes-to-as_completed-and-map-iterators-bpo.patch
Patch04: 0004-Make-Future.__repr__-subclass-friendly-bpo-22033-65.patch
BuildRequires: python2-devel BuildRequires: python2-devel
BuildArch: noarch BuildArch: noarch
@ -42,6 +43,9 @@ The concurrent.futures module provides a high-level interface for asynchronously
%{python2_sitelib}/futures-*.egg-info* %{python2_sitelib}/futures-*.egg-info*
%changelog %changelog
* Wed Dec 27 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 3.1.1-9
- Make Future.__repr__ subclass-friendly (bpo-22033) (#65)
* Thu Dec 21 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 3.1.1-8 * Thu Dec 21 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 3.1.1-8
- Backport fixes to as_completed and map iterators (bpo-27144) (#66) - Backport fixes to as_completed and map iterators (bpo-27144) (#66)