fixed simple deprecation warnings (issue #61) (#63)

* fixed simple deprecation warnings

* fixed the second assertRaisesRegex

* deprecation fix that allows successful build in Python 2.7 for Xenial

* added conditional for use of getargspec  Python2.7 in Xenial

* getfullargspec returns 7 values instead of 4 like getargspec

Author: zmk5

osrf_pycommon/cli_utils/verb_pattern.py

@@ -14,6 +14,7 @@
 
 """API for implementing commands and verbs which used the verb pattern."""
 
+import sys
 import inspect
 
 import pkg_resources
@@ -41,18 +42,36 @@ def call_prepare_arguments(func, parser, sysargs=None):
     func_args = [parser]
     # If the provided function takes two arguments and args were given
     # also give the args to the function
-    arguments, _, _, defaults = inspect.getargspec(func)
+
+    # Remove the following if condition and keep else condition once Xenial is
+    # dropped
+    if sys.version_info[0] < 3:
+        arguments, _, _, defaults = inspect.getargspec(func)
+
+    else:
+        arguments, _, _, defaults, _, _, _ = inspect.getfullargspec(func)
+
     if arguments[0] == 'self':
         del arguments[0]
     if defaults:
         arguments = arguments[:-len(defaults)]
     if len(arguments) not in [1, 2]:
+        # Remove the following if condition once Xenial is dropped
+        if sys.version_info[0] < 3:
+            raise ValueError("Given function '{0}' must have one or two "
+                             "parameters (excluding self), but got '{1}' "
+                             "parameters: '{2}'"
+                             .format(func.__name__,
+                                     len(arguments),
+                                     ', '.join(inspect.getargspec(func)[0])))
+
         raise ValueError("Given function '{0}' must have one or two "
                          "parameters (excluding self), but got '{1}' "
                          "parameters: '{2}'"
                          .format(func.__name__,
                                  len(arguments),
-                                 ', '.join(inspect.getargspec(func)[0])))
+                                 ', '.join(inspect.getfullargspec(func)[0])))
+
     if len(arguments) == 2:
         func_args.append(sysargs or [])
     return func(*func_args) or parser

tests/unit/test_cli_utils/test_verb_pattern.py

@@ -1,3 +1,4 @@
+import sys
 import unittest
 
 from osrf_pycommon.cli_utils import verb_pattern
@@ -66,8 +67,16 @@ def fake_prepare_arguments(self, parser, args, extra):
                 return parser
 
         f = Foo()
-        with self.assertRaisesRegexp(ValueError, 'one or two parameters'):
-            r = cpa(f.fake_prepare_arguments, None)
+
+        # Remove the following if condition and keep else condition once
+        # Xenial is dropped
+        if sys.version_info[0] < 3:
+            with self.assertRaisesRegexp(ValueError, 'one or two parameters'):
+                r = cpa(f.fake_prepare_arguments, None)
+
+        else:
+            with self.assertRaisesRegex(ValueError, 'one or two parameters'):
+                r = cpa(f.fake_prepare_arguments, None)
 
         # Try with less than needed
         called = False
@@ -81,8 +90,16 @@ def fake_prepare_arguments(self):
                 return 'Should not get here'
 
         f = Foo()
-        with self.assertRaisesRegexp(ValueError, 'one or two parameters'):
-            r = cpa(f.fake_prepare_arguments, None)
+
+        # Remove the following if condition and keep else condition once
+        # Xenial is dropped
+        if sys.version_info[0] < 3:
+            with self.assertRaisesRegexp(ValueError, 'one or two parameters'):
+                r = cpa(f.fake_prepare_arguments, None)
+
+        else:
+            with self.assertRaisesRegex(ValueError, 'one or two parameters'):
+                r = cpa(f.fake_prepare_arguments, None)
 
         # Try with additional optional argument
         called = False