commit: ad539b83f7d67a81f461535c6d8a27781584c27f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 03:56:06 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 04:27:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad539b83
dev-python/botocore: Sync the live ebuild
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/botocore/botocore-9999.ebuild | 4 --
.../botocore/files/botocore-1.26.0-py311.patch | 54 ----------------------
2 files changed, 58 deletions(-)
diff --git a/dev-python/botocore/botocore-9999.ebuild
b/dev-python/botocore/botocore-9999.ebuild
index 2fb86c59b25e..830c713f6036 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -37,10 +37,6 @@ BDEPEND="
)
"
-PATCHES=(
- "${FILESDIR}/botocore-1.26.0-py311.patch"
-)
-
distutils_enable_sphinx docs/source \
'dev-python/guzzle_sphinx_theme'
distutils_enable_tests pytest
diff --git a/dev-python/botocore/files/botocore-1.26.0-py311.patch
b/dev-python/botocore/files/botocore-1.26.0-py311.patch
deleted file mode 100644
index 8caa8765c008..000000000000
--- a/dev-python/botocore/files/botocore-1.26.0-py311.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 46a3d92e29a03f547d85861bb6e21281b6a42e60 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <[email protected]>
-Date: Sat, 14 May 2022 19:38:23 +0200
-Subject: [PATCH] Replace deprecated inspect.formatargspec() with
- inspect.signature()
-
-Originally submitted by Hugo van Kemenade as #2507. Modified by me
-to remove the first positional parameter like the old code did.
----
- botocore/docs/method.py | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/botocore/docs/method.py b/botocore/docs/method.py
-index 0f7c60f6c..44c97d6e4 100644
---- a/botocore/docs/method.py
-+++ b/botocore/docs/method.py
-@@ -11,6 +11,7 @@
- # ANY KIND, either express or implied. See the License for the specific
- # language governing permissions and limitations under the License.
- import inspect
-+import types
-
- from botocore.docs.example import (
- RequestExampleDocumenter,
-@@ -101,14 +102,18 @@ def document_custom_signature(
- :param exclude: The names of the parameters to exclude from
- documentation.
- """
-- argspec = inspect.getfullargspec(method)
-- signature_params = inspect.formatargspec(
-- args=argspec.args[1:],
-- varargs=argspec.varargs,
-- varkw=argspec.varkw,
-- defaults=argspec.defaults,
-- )
-- signature_params = signature_params.lstrip('(')
-+ signature = inspect.signature(method)
-+ # "raw" class methods are FunctionType and they include "self" param
-+ # object methods are MethodType and they skip the "self" param
-+ if isinstance(method, types.FunctionType):
-+ self_param = next(iter(signature.parameters))
-+ self_kind = signature.parameters[self_param].kind
-+ # safety check that we got the right parameter
-+ assert self_kind == inspect.Parameter.POSITIONAL_OR_KEYWORD
-+ new_params = signature.parameters.copy()
-+ del new_params[self_param]
-+ signature = signature.replace(parameters=new_params.values())
-+ signature_params = str(signature).lstrip('(')
- signature_params = signature_params.rstrip(')')
- section.style.start_sphinx_py_method(name, signature_params)
-
---
-2.35.1
-
