|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
From d2ab461d986dce252466c38b064aefdc42785f8a Mon Sep 17 00:00:00 2001
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
From: Juan Orti Alcaine <jortialc@redhat.com>
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
Date: Mon, 27 Jun 2022 19:38:34 +0200
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
Subject: [PATCH] Replace inspect.getargspec usage to support python 3.11
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
---
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
nyx/panel/__init__.py | 2 +-
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
test/__init__.py | 2 +-
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
index 57ae1e3..99b36d3 100644
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
--- a/nyx/panel/__init__.py
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
+++ b/nyx/panel/__init__.py
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
@@ -78,7 +78,7 @@ class KeyHandler(collections.namedtuple('Help', ['key', 'description', 'current'
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
is_match = self._key_func(key) if self._key_func else key.match(self.key)
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
if is_match:
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
- if inspect.getargspec(self._action).args == ['key']:
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
+ if inspect.getfullargspec(self._action).args == ['key']:
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
self._action(key)
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
else:
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
self._action()
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
diff --git a/test/__init__.py b/test/__init__.py
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
index b259f7b..d9f0875 100644
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
--- a/test/__init__.py
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
+++ b/test/__init__.py
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
@@ -94,7 +94,7 @@ def render(func, *args, **kwargs):
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
nyx.curses.CURSES_SCREEN.erase()
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
start_time = time.time()
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
- func_args = inspect.getargspec(func).args
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
+ func_args = inspect.getfullargspec(func).args
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
if func_args[:1] == ['subwindow'] or func_args[:2] == ['self', 'subwindow']:
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
def _draw(subwindow):
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
--
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
2.36.1
|
|
![](https://seccdn.libravatar.org/avatar/21a80fc04dc146c2e24043fb81163106155ef0ac82685eecad070bcb7b199091?s=16&d=retro) |
7b578a4 |
|