package/python-pycli: fix build with python >= 3.10

Fix the following build failure raised since bump of python3 to version
3.10.1 in commit 25b1fc2898 due to the new
"Multiple Exception types without parentheses" exception
(https://docs.python.org/3/whatsnew/3.10.html)

error:   File "/usr/lib/python3.10/site-packages/cli/app.py", line 242
    except Exception, e:
           ^^^^^^^^^^^^
SyntaxError: multiple exception types must be parenthesized

Fixes:
 - http://autobuild.buildroot.org/results/8d7b0c23472abffc9447e4a6de273bdd04486d39

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
Fabrice Fontaine 2022-02-15 14:29:09 +01:00 committed by Yann E. MORIN
parent d06737b27b
commit b2e6e376a2
2 changed files with 67 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001
From: mmbutter <mario.butter@gmail.com>
Date: Tue, 9 Jun 2020 11:50:41 -0500
Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions.
[Retrieved from:
https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
lib/cli/app.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/cli/app.py b/lib/cli/app.py
index 7b6db52..f487ab4 100644
--- a/lib/cli/app.py
+++ b/lib/cli/app.py
@@ -240,6 +240,9 @@ def run(self):
try:
returned = self.main(*args)
except Exception, e:
+ elif isinstance(e, self.reraise):
+ # raising the last exception preserves traceback
+ raise
returned = e
return self.post_run(returned)

View File

@ -0,0 +1,41 @@
From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001
From: mmbutter <mario.butter@gmail.com>
Date: Thu, 11 Jun 2020 15:50:03 -0500
Subject: [PATCH] except statement changed slightly in 2.6. This could cause
problems in newer versions. Updated to the new format.
[Retrieved from:
https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
lib/cli/app.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/cli/app.py b/lib/cli/app.py
index f487ab4..45256b8 100644
--- a/lib/cli/app.py
+++ b/lib/cli/app.py
@@ -239,10 +239,10 @@ def run(self):
args = ()
try:
returned = self.main(*args)
- except Exception, e:
- elif isinstance(e, self.reraise):
- # raising the last exception preserves traceback
- raise
+ except self.reraise:
+ # raising the last exception preserves traceback
+ raise
+ except Exception as e:
returned = e
return self.post_run(returned)
@@ -420,7 +420,7 @@ def pre_run(self):
"""
try:
ns = self.argparser.parse_args()
- except SystemExit, e:
+ except SystemExit as e:
if self.exit_after_main:
raise
else: