Added inspection support for func(a, *, b) signature types.

2 files changed, 16 insertions, 2 deletions

diff --git a/bottle.py b/bottle.py
index 2e8b551..ec7a7f9 100644
--- a/bottle.py
+++ b/bottle.py
@@ -94,8 +94,15 @@ try:
                     defaults.append(param.default)
         return (args, varargs, keywords, tuple(defaults) or None)
 except ImportError:
-    from inspect import getargspec
-    
+    try:
+        from inspect import getfullargspec
+        def getargspec(func):
+            spec = getfullargspec(func)
+            kwargs = makelist(spec[0]) + makelist(spec.kwonlyargs)
+            return kwargs, spec[1], spec[2], spec[3]
+    except ImportError:
+        from inspect import getargspec
+
 try:
     from simplejson import dumps as json_dumps, loads as json_lds
 except ImportError:  # pragma: no cover
diff --git a/test/test_route.py b/test/test_route.py
index 237d3c7..ba0a06a 100644
--- a/test/test_route.py
+++ b/test/test_route.py
@@ -48,3 +48,10 @@ class TestRoute(unittest.TestCase):
 
         # triggers the "TypeError: 'foo' is not a Python function"
         self.assertEqual(set(route.get_callback_args()), set(['a', 'b']))
+
+    if bottle.py3k:
+        def test_callback_inspection_newsig(self):
+            env = {}
+            eval(compile('def foo(a, *, b=5): pass', '<foo>', 'exec'), env, env)
+            route = bottle.Route(None, None, None, env['foo'])
+            self.assertEqual(set(route.get_callback_args()), set(['a', 'b']))