Fix WebhookHandler.__get_args_count to enable to corp with functions with

varargs

Author: loloicci

linebot/webhook.py

@@ -261,22 +261,22 @@ def __add_handler(self, func, event, message=None):
 
     @classmethod
     def __invoke_func(cls, func, event, payload):
-        args_count = cls.__get_args_count(func)
-        if args_count == 0:
-            func()
+        (has_varargs, args_count) = cls.__get_args_count(func)
+        if has_varargs or args_count == 2:
+            func(event, payload.destination)
         elif args_count == 1:
             func(event)
         else:
-            func(event, payload.destination)
+            func()
 
     @staticmethod
     def __get_args_count(func):
         if PY3:
             arg_spec = inspect.getfullargspec(func)
-            return len(arg_spec.args)
+            return (arg_spec.varargs is not None, len(arg_spec.args))
         else:
             arg_spec = inspect.getargspec(func)
-            return len(arg_spec.args)
+            return (arg_spec.varargs is not None, len(arg_spec.args))
 
     @staticmethod
     def __get_handler_key(event, message=None):

tests/test_webhook.py

@@ -17,6 +17,7 @@
 import os
 import unittest
 from builtins import open
+import inspect
 
 from linebot import (
     SignatureValidator, WebhookParser, WebhookHandler
@@ -29,6 +30,7 @@
     LocationMessage, StickerMessage, FileMessage,
     SourceUser, SourceRoom, SourceGroup,
     DeviceLink, DeviceUnlink, ScenarioResult, ActionResult)
+from linebot.utils import PY3
 
 
 class TestSignatureValidator(unittest.TestCase):
@@ -529,6 +531,15 @@ def test_handler(self):
 
 class TestInvokeWebhookHandler(unittest.TestCase):
     def setUp(self):
+        def wrap(func):
+            def wrapper(*args):
+                if PY3:
+                    arg_spec = inspect.getfullargspec(func)
+                else:
+                    arg_spec = inspect.getargspec(func)
+                return func(*args[0:len(arg_spec.args)])
+            return wrapper
+
         def func_with_0_args():
             assert True
 
@@ -547,13 +558,44 @@ def func_with_2_args_with_default(arg1=False, arg2=False):
         def func_with_1_arg_and_1_arg_with_default(arg1, arg2=False):
             assert arg1 and arg2
 
+        @wrap
+        def wrapped_func_with_0_args():
+            assert True
+
+        @wrap
+        def wrapped_func_with_1_arg(arg):
+            assert arg
+
+        @wrap
+        def wrapped_func_with_2_args(arg1, arg2):
+            assert arg1 and arg2
+
+        @wrap
+        def wrapped_func_with_1_arg_with_default(arg=False):
+            assert arg
+
+        @wrap
+        def wrapped_func_with_2_args_with_default(arg1=False, arg2=False):
+            assert arg1 and arg2
+
+        @wrap
+        def wrapped_func_with_1_arg_and_1_arg_with_default(
+                arg1, arg2=False):
+            assert arg1 and arg2
+
         self.functions = [
             func_with_0_args,
             func_with_1_arg,
             func_with_2_args,
             func_with_1_arg_with_default,
             func_with_2_args_with_default,
             func_with_1_arg_and_1_arg_with_default,
+            wrapped_func_with_0_args,
+            wrapped_func_with_1_arg,
+            wrapped_func_with_2_args,
+            wrapped_func_with_1_arg_with_default,
+            wrapped_func_with_2_args_with_default,
+            wrapped_func_with_1_arg_and_1_arg_with_default,
         ]
 
     def test_invoke_func(self):