From 87c586051fa6b71d105f120e51c2420a10c32d5b Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 5 Sep 2023 11:13:19 +0100 Subject: [PATCH] Remove use of deprecated APIs inspect.getargspec is gone in Python 3.11. unittest.TestCase.assertRaisesRegex is preferred to unittest.TestCase.assertRaisesRegexp. Change-Id: Ib6ec492e8c892424ab408a96696df346c3bbfde3 Signed-off-by: Stephen Finucane --- wsme/tests/test_types.py | 15 ++++++++------- wsmeext/flask.py | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/wsme/tests/test_types.py b/wsme/tests/test_types.py index f5f5abe..0f3c190 100644 --- a/wsme/tests/test_types.py +++ b/wsme/tests/test_types.py @@ -177,13 +177,14 @@ class TestTypes(unittest.TestCase): obj.a = 'v1' assert obj.a == 'v1', repr(obj.a) - self.assertRaisesRegexp(exc.InvalidInput, - "Invalid input for field/attribute a. \ -Value: 'v3'. Value should be one of: v., v.", - setattr, - obj, - 'a', - 'v3') + self.assertRaisesRegex( + exc.InvalidInput, + "Invalid input for field/attribute a. " + "Value: 'v3'. Value should be one of: v., v.", + setattr, + obj, + 'a', + 'v3') def test_attribute_validation(self): class AType(object): diff --git a/wsmeext/flask.py b/wsmeext/flask.py index 7ce5760..80836d9 100644 --- a/wsmeext/flask.py +++ b/wsmeext/flask.py @@ -42,7 +42,7 @@ def signature(*args, **kw): sig = wsme.signature(*args, **kw) def decorator(f): - args = inspect.getargspec(f)[0] + args = inspect.getfullargspec(f)[0] ismethod = args and args[0] == 'self' sig(f) funcdef = wsme.api.FunctionDefinition.get(f)