summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Grönholm <alex.gronholm@nextday.fi>2017-12-12 23:48:10 +0200
committerAlex Grönholm <alex.gronholm@nextday.fi>2017-12-13 00:39:40 +0200
commit488cd5cfd74bcfa71b7b493e14f30af90ee2156e (patch)
tree6e08ee211ff6eaf570a7abd4179871fcef938ad8
parent9688c9d5631699dc15095e92ff0bb8e505dc0df5 (diff)
downloadapscheduler-488cd5cfd74bcfa71b7b493e14f30af90ee2156e.tar.gz
Fixed passing "wait" as keyword argument to AsyncIOScheduler.shutdown()
-rw-r--r--apscheduler/schedulers/asyncio.py7
-rw-r--r--docs/versionhistory.rst2
2 files changed, 6 insertions, 3 deletions
diff --git a/apscheduler/schedulers/asyncio.py b/apscheduler/schedulers/asyncio.py
index a272b1a..289ef13 100644
--- a/apscheduler/schedulers/asyncio.py
+++ b/apscheduler/schedulers/asyncio.py
@@ -1,5 +1,5 @@
from __future__ import absolute_import
-from functools import wraps
+from functools import wraps, partial
from apscheduler.schedulers.base import BaseScheduler
from apscheduler.util import maybe_ref
@@ -16,8 +16,9 @@ except ImportError: # pragma: nocover
def run_in_event_loop(func):
@wraps(func)
- def wrapper(self, *args):
- self._eventloop.call_soon_threadsafe(func, self, *args)
+ def wrapper(self, *args, **kwargs):
+ wrapped = partial(func, self, *args, **kwargs)
+ self._eventloop.call_soon_threadsafe(wrapped)
return wrapper
diff --git a/docs/versionhistory.rst b/docs/versionhistory.rst
index 1850059..9bcf89e 100644
--- a/docs/versionhistory.rst
+++ b/docs/versionhistory.rst
@@ -22,6 +22,8 @@ APScheduler, see the :doc:`migration section <migration>`.
* Fixed memory leak due to a cyclic reference when jobs raise exceptions
(thanks to gilbsgilbs for help on solving this)
+* Fixed passing ``wait=True`` to ``AsyncIOScheduler.shutdown()`` (although it doesn't do much)
+
3.4.0
-----