From 090a1bd44da1e11f45cefe7aa6c5b9743ca3ab9d Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Wed, 31 Oct 2018 17:20:31 -0700 Subject: [PATCH] getargspec is deprecated in python 3 --- certbot/tests/display/util_test.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/certbot/tests/display/util_test.py b/certbot/tests/display/util_test.py index 5672a20bd..f7d1a8a37 100644 --- a/certbot/tests/display/util_test.py +++ b/certbot/tests/display/util_test.py @@ -16,6 +16,11 @@ CHOICES = [("First", "Description1"), ("Second", "Description2")] TAGS = ["tag1", "tag2", "tag3"] TAGS_CHOICES = [("1", "tag1"), ("2", "tag2"), ("3", "tag3")] +if six.PY2: + getargspec = inspect.getargspec +else: + getargspec = inspect.getfullargspec + class InputWithTimeoutTest(unittest.TestCase): """Tests for certbot.display.util.input_with_timeout.""" @@ -314,7 +319,7 @@ class FileOutputDisplayTest(unittest.TestCase): # Every IDisplay method implemented by FileDisplay must take # force_interactive to prevent workflow regressions. for name in interfaces.IDisplay.names(): # pylint: disable=no-member - arg_spec = inspect.getargspec(getattr(self.displayer, name)) + arg_spec = getargspec(getattr(self.displayer, name)) self.assertTrue("force_interactive" in arg_spec.args) @@ -371,7 +376,7 @@ class NoninteractiveDisplayTest(unittest.TestCase): for name in interfaces.IDisplay.names(): # pylint: disable=no-member method = getattr(self.displayer, name) # asserts method accepts arbitrary keyword arguments - self.assertFalse(inspect.getargspec(method).keywords is None) + self.assertFalse(getargspec(method).keywords is None) class SeparateListInputTest(unittest.TestCase):