diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-05-23 12:44:44 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2022-05-23 12:44:44 +0000 |
| commit | 844aa75a95286749e4b5e87ff4145c71bbc91b70 (patch) | |
| tree | d8a2630001156e417c085128c4d19d47315bc3e2 /dev-python/cherrypy | |
| parent | 7dca8a2be3fbfd4dc89ba51566ff47e4e73de078 (diff) | |
| download | baldeagleos-repo-844aa75a95286749e4b5e87ff4145c71bbc91b70.tar.gz baldeagleos-repo-844aa75a95286749e4b5e87ff4145c71bbc91b70.tar.xz baldeagleos-repo-844aa75a95286749e4b5e87ff4145c71bbc91b70.zip | |
Adding metadata
Diffstat (limited to 'dev-python/cherrypy')
| -rw-r--r-- | dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild | 12 | ||||
| -rw-r--r-- | dev-python/cherrypy/files/cherrypy-18.6.1-py311.patch | 32 |
2 files changed, 44 insertions, 0 deletions
diff --git a/dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild b/dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild index 8269b7ee1079..69eff59266d1 100644 --- a/dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild +++ b/dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild @@ -52,6 +52,7 @@ python_prepare_all() { local PATCHES=( # https://github.com/cherrypy/cherrypy/pull/1946 "${FILESDIR}"/${P}-close-files.patch + "${FILESDIR}"/${P}-py311.patch ) sed -r -e '/(pytest-sugar|pytest-cov)/ d' \ @@ -64,3 +65,14 @@ python_prepare_all() { distutils-r1_python_prepare_all } + +python_test() { + local EPYTEST_DESELECT=() + [[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=( + # broken by changes in traceback output + cherrypy/test/test_request_obj.py::RequestObjectTests::testErrorHandling + cherrypy/test/test_tools.py::ToolTests::testHookErrors + ) + + epytest +} diff --git a/dev-python/cherrypy/files/cherrypy-18.6.1-py311.patch b/dev-python/cherrypy/files/cherrypy-18.6.1-py311.patch new file mode 100644 index 000000000000..5d629dd8c333 --- /dev/null +++ b/dev-python/cherrypy/files/cherrypy-18.6.1-py311.patch @@ -0,0 +1,32 @@ +From 8245a74aa4e090c40445535a9ce3997ed9904798 Mon Sep 17 00:00:00 2001 +From: Dominic Davis-Foster <dominic@davis-foster.co.uk> +Date: Fri, 28 Jan 2022 23:11:52 +0000 +Subject: [PATCH] Switch from inspect.getargspec to inspect.getfullargspec + +inspect.getargspec has been deprecated since 3.0 +--- + cherrypy/_cpdispatch.py | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/cherrypy/_cpdispatch.py b/cherrypy/_cpdispatch.py +index 83eb79cb..5c506e99 100644 +--- a/cherrypy/_cpdispatch.py ++++ b/cherrypy/_cpdispatch.py +@@ -206,12 +206,8 @@ except ImportError: + def test_callable_spec(callable, args, kwargs): # noqa: F811 + return None + else: +- getargspec = inspect.getargspec +- # Python 3 requires using getfullargspec if +- # keyword-only arguments are present +- if hasattr(inspect, 'getfullargspec'): +- def getargspec(callable): +- return inspect.getfullargspec(callable)[:4] ++ def getargspec(callable): ++ return inspect.getfullargspec(callable)[:4] + + + class LateParamPageHandler(PageHandler): +-- +2.35.1 + |