Skip to contentSkip to conversation

python3-wxgtk4: replace deprecated inspect.getargspec

PATCH In review [email protected] 2 participants 4 messages Dec 4, 2022 – Dec 5, 2022

lore
Share & tools
lore
#0 lore raw

v2 cover python3-wxgtk4: replace deprecated inspect.getargspec

From: Kai Kang <[email protected]>

Hi Khem,

The backported patch is dos format which ends with CRLF. But the other part of this commit still end with LF. It seems fail to call git apply directly. So I pushed to github:

https://github.com/kkang-wr/meta-openembedded/commit/b9a114e5c992afd6619512cd78098ef9d9072170

It should be fetched and cherry-picked.

Thanks,

Kai Kang (1):
python3-wxgtk4: replace deprecated inspect.getargspec

 ...eplace-deprecated-inspect.getargspec.patch | 65 +++++++++++++++++++
 .../python3-wxgtk4/python3-wxgtk4_4.2.0.bb    |  2 +
 2 files changed, 67 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 python3-wxgtk4: replace deprecated inspect.getargspec

From: Kai Kang <[email protected]>

Backport patch to replace deprecated inspect.getargspec in lib pubsub.

And add python3-pip to RDEPENDS which is required by utils wxdemo, wxdocs and wxget provided by python3-wxgtk4.

---
 ...eplace-deprecated-inspect.getargspec.patch | 65 +++++++++++++++++++
 .../python3-wxgtk4/python3-wxgtk4_4.2.0.bb    |  2 +
 2 files changed, 67 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch
meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch new file +65 -0
new file mode 100644
index 000000000..9bec4c5ba
@@ -0,0 +1,65 @@
+Upstream-Status: Backport [https://github.com/wxWidgets/Phoenix/commit/9986a0d5]
+
+Signed-off-by: Kai Kang <[email protected]>
+
+From 9986a0d5c24b5d45ddf571d60351f68765a8a9be Mon Sep 17 00:00:00 2001
+From: Scott Talbert <[email protected]>
+Date: Mon, 8 Aug 2022 22:35:58 -0400
+Subject: [PATCH] pypubsub: Replace deprecated inspect.getargspec
+
+inspect.getargspec was removed in Python 3.11.  This is a backport of:
+https://github.com/schollii/pypubsub/commit/089c7a73f85c76a3aa22e4b10c71db1bf65a8637
+---
+ wx/lib/pubsub/core/callables.py | 23 +++++++++++++++--------
+ 1 file changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/wx/lib/pubsub/core/callables.py b/wx/lib/pubsub/core/callables.py
+index 65eb1ebe..7e798c54 100644
+--- a/wx/lib/pubsub/core/callables.py
++++ b/wx/lib/pubsub/core/callables.py
+@@ -12,7 +12,7 @@ CallArgsInfo regarding its autoTopicArgName data member.
+ 
+ """
+ 
+-from inspect import getargspec, ismethod, isfunction
++from inspect import ismethod, isfunction, signature, Parameter
+ 
+ from .. import py2and3
+ 
+@@ -133,19 +133,26 @@ class CallArgsInfo:
+         self.autoTopicArgName = None."""
+ 
+         #args, firstArgIdx, defaultVals, acceptsAllKwargs
+-        (allParams, varParamName, varOptParamName, defaultVals) = getargspec(func)
+-        if defaultVals is None:
+-            defaultVals = []
+-        else:
+-            defaultVals = list(defaultVals)
++        allParams = []
++        defaultVals = []
++        varParamName = None
++        varOptParamName = None
++        for argName, param in signature(func).parameters.items():
++            if param.default != Parameter.empty:
++                defaultVals.append(param.default)
++            if param.kind == Parameter.VAR_POSITIONAL:
++                varParamName = argName
++            elif param.kind == Parameter.VAR_KEYWORD:
++                varOptParamName = argName
++            else:
++                allParams.append(argName)
+ 
+         self.acceptsAllKwargs      = (varOptParamName is not None)
+         self.acceptsAllUnnamedArgs = (varParamName    is not None)
+-
+         self.allParams = allParams
+-        del self.allParams[0:firstArgIdx] # does nothing if firstArgIdx == 0
+ 
+         self.numRequired = len(self.allParams) - len(defaultVals)
++        assert len(self.allParams) >= len(defaultVals)
+         assert self.numRequired >= 0
+ 
+         # if listener wants topic, remove that arg from args/defaultVals
+-- 
+2.34.1
+
meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4_4.2.0.bb +2 -0
index faea43777..df23037fc 100644
@@ -13,6 +13,7 @@ PYPI_PACKAGE = "wxPython"
 SRC_URI += "file://add-back-option-build-base.patch \
             file://wxgtk-fixup-build-scripts.patch \
             file://not-overwrite-cflags-cxxflags.patch \
+            file://0001-pypubsub-Replace-deprecated-inspect.getargspec.patch \
             "
 SRC_URI[sha256sum] = "663cebc4509d7e5d113518865fe274f77f95434c5d57bc386ed58d65ceed86c7"
 
@@ -29,6 +30,7 @@ RDEPENDS:${PN} = "\
     python3-image \
     python3-numpy \
     python3-pillow \
+    python3-pip \
     python3-pprint \
     python3-pycairo \
     python3-six \
Signature · 1 line
2.17.1
#2 lore raw
In reply to [email protected]
Quoted 5 lines · On Sat, Dec 3, 2022 at 10:44 PM <[email protected]> wrote:

From: Kai Kang <[email protected]>

Hi Khem,

Quoted 7 lines

The backported patch is dos format which ends with CRLF. But the other part of this commit still end with LF. It seems fail to call git apply directly. So I pushed to github:

https://github.com/kkang-wr/meta-openembedded/commit/b9a114e5c992afd6619512cd78098ef9d9072170

It should be fetched and cherry-picked

Please create a PR for ease against
https://github.com/openembedded/meta-openembedded
as a special case.

Quoted 14 lines

Thanks,

Kai Kang (1):
python3-wxgtk4: replace deprecated inspect.getargspec

 ...eplace-deprecated-inspect.getargspec.patch | 65 +++++++++++++++++++
 .../python3-wxgtk4/python3-wxgtk4_4.2.0.bb    |  2 +
 2 files changed, 67 insertions(+)
 create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch

--
2.17.1

author
#3 lore raw
Quoted 9 lines · Khem Raj
Quoted 8 lines · On Sat, Dec 3, 2022 at 10:44 PM <[email protected]> wrote:

From: Kai Kang <[email protected]>

Hi Khem,

The backported patch is dos format which ends with CRLF. But the other part of this commit still end with LF. It seems fail to call git apply directly. So I pushed to github:

Quoted 6 lines
Quoted 3 lines

https://github.com/kkang-wr/meta-openembedded/commit/b9a114e5c992afd6619512cd78098ef9d9072170

It should be fetched and cherry-picked

Please create a PR for ease against
https://github.com/openembedded/meta-openembedded
as a special case.

OK. Thanks.

Kai

Quoted 23 lines
Quoted 23 lines

Thanks,

Kai Kang (1):
python3-wxgtk4: replace deprecated inspect.getargspec

  ...eplace-deprecated-inspect.getargspec.patch | 65 +++++++++++++++++++
  .../python3-wxgtk4/python3-wxgtk4_4.2.0.bb    |  2 +
  2 files changed, 67 insertions(+)

create mode 100644 meta-python/recipes-devtools/python3-wxgtk4/python3-wxgtk4/0001-pypubsub-Replace-deprecated-inspect.getargspec.patch

--
2.17.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#99947): https://lists.openembedded.org/g/openembedded-devel/message/99947
Mute This Topic: https://lists.openembedded.org/mt/95442606/3616933
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Signature · 2 lines
Kai Kang
Wind River Linux