Fixed issue #246 by Schedule functions with arguments

.pre-commit-config.yaml

@@ -13,3 +13,5 @@ repos:
   hooks:
     - id: flake8
       exclude: "^(doc|examples)/"
+      args:
+        - --ignore=E303

pgzero/__init__.py

@@ -5,4 +5,4 @@
 
 """
 
-__version__ = '1.3.dev0'
+__version__ = '1.3.dev1'

pgzero/actor.py

@@ -362,4 +362,4 @@ def distance_to(self, target):
         return sqrt(dx * dx + dy * dy)
 
     def unload_image(self):
-        loaders.images.unload(self._image_name)
+        loaders.images.unload(self._image_name)

pgzero/clock.py

@@ -8,6 +8,8 @@
 from weakref import ref
 from functools import total_ordering
 from types import MethodType
+from functools import partial
+from collections import defaultdict
 
 __all__ = [
     'Clock', 'schedule', 'schedule_interval', 'unschedule'
@@ -34,6 +36,11 @@ def weakref():
 def mkref(o):
     if isinstance(o, MethodType):
         return weak_method(o)
+    elif isinstance(o, partial):
+        if o.args or o.keywords:
+            return o
+        else:
+            return o.func
     else:
         try:
             return ref(o)
@@ -66,7 +73,13 @@ def __eq__(self, ano):
 
     @property
     def callback(self):
-        return self.cb()
+        cb = self.cb()
+        if cb is None:
+            return None
+        if isinstance(cb, partial):
+            return cb.func if cb.args or cb.keywords else cb
+        return cb.__func__ if isinstance(cb, MethodType) else cb
+
 
 
 class Clock:
@@ -89,6 +102,7 @@ def __init__(self):
         self.fired = False
         self.events = []
         self._each_tick = []
+        self._scheduled_callbacks = defaultdict(int)
 
     def clear(self):
         """Remove all handlers from this clock."""
@@ -113,8 +127,13 @@ def schedule_unique(self, callback, delay):
         :param delay: The delay before the call (in clock time / seconds).
 
         """
-        self.unschedule(callback)
-        self.schedule(callback, delay)
+        count = self._scheduled_callbacks[callback]
+        if count == 0:
+            self._scheduled_callbacks[callback] = 1
+            self.schedule(callback, delay)
+        else:
+            self._scheduled_callbacks[callback] = count + 1
+
 
     def schedule_interval(self, callback, delay):
         """Schedule callback to be called every `delay` seconds.

pgzero/music.py

@@ -108,4 +108,4 @@ def fadeout(seconds):
 get_volume = _music.get_volume
 set_volume = _music.set_volume
 get_pos = _music.get_pos
-set_pos = _music.set_pos
+set_pos = _music.set_pos