Merge pull request #30 from waveform80/flexible-events-opt-params

Flexible events opt params

gpiozero/input_devices.py

@@ -75,18 +75,20 @@ class WaitableInputDevice(InputDevice):
             raise InputDeviceError('value must be None or a callable')
         else:
             # Try binding ourselves to the argspec of the provided callable.
-            # If this works, assume the function is capable of accepting us
+            # If this works, assume the function is capable of accepting no
-            # as the only (mandatory) parameter.
+            # parameters
             try:
-                inspect.getcallargs(fn, self)
+                inspect.getcallargs(fn)
-                @wraps(fn)
+                return fn
-                def wrapper():
-                    return fn(self)
-                return wrapper
             except TypeError:
                 try:
-                    inspect.getcallargs(fn)
+                    # If the above fails, try binding with a single parameter
-                    return fn
+                    # (ourselves). If this works, wrap the specified callback
+                    inspect.getcallargs(fn, self)
+                    @wraps(fn)
+                    def wrapper():
+                        return fn(self)
+                    return wrapper
                 except TypeError:
                     raise InputDeviceError(
                         'value must be a callable which accepts up to one '