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)