mpf 0.81.0.dev2__tar.gz → 0.81.0.dev4__tar.gz

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/.github/workflows/run_tests.yml

@@ -96,7 +96,7 @@ jobs:
 
       - name: Upload coverage data to coveralls.io
         if: matrix.os != 'windows-latest'
-        run: coveralls --service=github
+        run: coveralls --service=github-actions
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           COVERALLS_FLAG_NAME: ${{ matrix.python-version }}-${{ matrix.os }}
@@ -111,6 +111,6 @@ jobs:
     - name: Finished
       run: |
         pip3 install --upgrade coveralls
-        coveralls --service=github --finish
+        coveralls --service=github-actions --finish
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mpf
-Version: 0.81.0.dev2
+Version: 0.81.0.dev4
 Summary: The Mission Pinball Framework (MPF)
 Author-email: The Mission Pinball Framework Team <brian@missionpinball.org>
 License: MIT
@@ -85,7 +85,7 @@ What is Mission Pinball Framework?
 Mission Pinball Framework (MPF) is open source, cross-platform software for powering real pinball
 machines. MPF is a community-developed project released under the MIT license. It's supported by volunteers in their spare time.
 
-[![Coverage Status](https://coveralls.io/repos/missionpinball/mpf/badge.svg?branch=dev&service=github)](https://coveralls.io/github/missionpinball/mpf?branch=dev)
+[![Coverage Status](https://coveralls.io/repos/github/missionpinball/mpf/badge.svg?branch=dev)](https://coveralls.io/github/missionpinball/mpf?branch=dev)
 [![Test Status](https://github.com/missionpinball/mpf/actions/workflows/run_tests.yml/badge.svg)](https://github.com/missionpinball/mpf/actions/workflows/run_tests.yml)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1687/badge)](https://bestpractices.coreinfrastructure.org/projects/1687)
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/README.md

@@ -11,7 +11,7 @@ What is Mission Pinball Framework?
 Mission Pinball Framework (MPF) is open source, cross-platform software for powering real pinball
 machines. MPF is a community-developed project released under the MIT license. It's supported by volunteers in their spare time.
 
-[![Coverage Status](https://coveralls.io/repos/missionpinball/mpf/badge.svg?branch=dev&service=github)](https://coveralls.io/github/missionpinball/mpf?branch=dev)
+[![Coverage Status](https://coveralls.io/repos/github/missionpinball/mpf/badge.svg?branch=dev)](https://coveralls.io/github/missionpinball/mpf?branch=dev)
 [![Test Status](https://github.com/missionpinball/mpf/actions/workflows/run_tests.yml/badge.svg)](https://github.com/missionpinball/mpf/actions/workflows/run_tests.yml)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1687/badge)](https://bestpractices.coreinfrastructure.org/projects/1687)
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/docs/dev/Send variables via self.machine.events.post.rst

@@ -6,7 +6,7 @@ http://developer.missionpinball.org/en/dev/api/self.machine.events.html?highligh
 
 The best example here is to use the communication between MPF and MPF MC.
 MPF MC can pretty much only read variables from ``self.player`` from MPF (``self.mc.player`` in MC),  however you simply don't want
-to create extra variables in here just to make it readable readable in MC. This would result in having to much unnecessary data. 
+to create extra variables in here just to make it readable readable in MC. This would result in having to much unnecessary data.
 Instead you can use ``self.machine.events.post`` just like you would write a function in python.
 
 For example we set this up in a mode code in MPF:
@@ -21,7 +21,7 @@ It should always start with the ``event`` that you want to post. After this you
 In MC code we create a function that will be activated once the event is posted. Make sure you have added a event_handler first or else it won't work.
 
 .. code-block:: python
-    
+
   def awesome_event(self, data1, data2, **kwargs):
     print("i really love the game {} I always end up {}".format(data1, data2)
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/docs/overview/installation.rst

@@ -47,8 +47,8 @@ In order to build the developer documentation, you will also need:
 * ``sphinxcontrib.napoleon``
 * ``gitpython``
 
-Building the developer documentation requires a symbolic link from ``mpf\docs\examples`` to a checkout of the ``mpf-examples`` repository. 
-This is normally automatically created when the documentation is built, but under Windows 10 and higher, symlinks can only be created by 
-administrators, so the process will fail. If you would prefer not to run the build as an administrator, you can create the link manually 
+Building the developer documentation requires a symbolic link from ``mpf\docs\examples`` to a checkout of the ``mpf-examples`` repository.
+This is normally automatically created when the documentation is built, but under Windows 10 and higher, symlinks can only be created by
+administrators, so the process will fail. If you would prefer not to run the build as an administrator, you can create the link manually
 by running ``mklink /d examples <examples directory>`` at the command line from inside the ``docs`` directory.
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/docs/testing/running_mpf_tests.rst

@@ -14,8 +14,8 @@ test that's run), and then when it's done, you should see a message showing
 how many tests were run and that they were successful. The whole process should
 take less a minute or so.
 
-Note that ``mpf-mc`` must be installed as well as ``mpf`` for all tests to run. 
-If it isn't, some tests will fail with the error "start took more than 20s", because 
+Note that ``mpf-mc`` must be installed as well as ``mpf`` for all tests to run.
+If it isn't, some tests will fail with the error "start took more than 20s", because
 MPF waited endlessly for the nonexistent media controller to be available.
 
 (If you see any messages about some tests taking more than 0.5s, that's ok.)

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/_version.py

@@ -10,7 +10,7 @@ PyPI.
 
 """
 
-__version__ = '0.81.0.dev2'
+__version__ = '0.81.0.dev4'
 '''The full version of MPF.'''
 
 __short_version__ = '0.81'

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/assets/show.py

@@ -2,15 +2,15 @@
 import re
 from collections import namedtuple
 
-from typing import List, Dict, Any, Optional
+from typing import List, Dict, Any, Optional, TYPE_CHECKING
 
 from mpf.core.assets import AssetPool
 from mpf.core.config_validator import RuntimeToken
 from mpf.core.utility_functions import Util
 from mpf.exceptions.config_file_error import ConfigFileError
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from typing import NoReturn     # pylint: disable-msg=cyclic-import,unused-import
 
 __api__ = ['Show', 'RunningShow', 'ShowPool']

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/commands/game.py

@@ -169,6 +169,8 @@ class Command:
         console_log.setFormatter(logging.Formatter(
             '%(asctime)s.%(msecs)03d : %(levelname)s [%(name)s] %(message)s', "%H:%M:%S"))
 
+        console_log.addFilter(ConsoleCustomLevelFilter())
+
         # initialize async handler for console
         console_log_queue = Queue()
         console_queue_handler = QueueHandler(console_log_queue)
@@ -183,6 +185,7 @@ class Command:
         else:
             formatter = logging.Formatter('%(asctime)s : %(levelname)s : %(name)s : %(message)s')
         file_log.setFormatter(formatter)
+        file_log.addFilter(FileCustomLevelFilter())
 
         # initialize async handler for file log
         file_log_queue = Queue()
@@ -237,6 +240,8 @@ class Command:
     def sigint_handler(self, signum=None, frame=None):
         """Handle SIGINT."""
         del signum, frame
+        if self.machine:
+            self.machine.error_log("SIGINT received")
         self._sigint_count += 1
         if self._sigint_count > 1:
             self.exit("Received second SIGINT. Will exit ungracefully!")
@@ -273,3 +278,25 @@ class Command:
             input('Press ENTER to continue...')     # nosec
 
         sys.exit()
+
+
+class ConsoleCustomLevelFilter(logging.Filter):
+
+    """Filters out custom levels meant strictly for files."""
+
+    def filter(self, record):
+        """Filters: 11 = DEBUG (File Only), 21 = INFO (File Only)."""
+        if record.levelno in (11, 21):
+            return False
+        return True
+
+
+class FileCustomLevelFilter(logging.Filter):
+
+    """Filters out custom levels meant strictly for console."""
+
+    def filter(self, record):
+        """Filters: 12 = DEBUG (Console Only), 22 = INFO (Console Only)."""
+        if record.levelno in (12, 22):
+            return False
+        return True

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/config_players/hardware_sound_player.py

@@ -1,10 +1,10 @@
 """Config player for sounds on an external sound card."""
-from typing import List
+from typing import List, TYPE_CHECKING
 
 from mpf.config_players.device_config_player import DeviceConfigPlayer
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.devices.hardware_sound_system import HardwareSoundSystem   # pylint: disable-msg=cyclic-import,unused-import; # noqa
 
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/config_players/segment_display_player.py

@@ -1,12 +1,14 @@
 """Config player for text on segment displays."""
+from typing import TYPE_CHECKING
+
 from mpf.core.delays import DelayManager
 
 from mpf.config_players.device_config_player import DeviceConfigPlayer
 from mpf.platforms.interfaces.segment_display_platform_interface import FlashingType
 from mpf.devices.segment_display.transition_manager import TransitionManager
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from typing import Dict     # pylint: disable-msg=cyclic-import,unused-import
     from mpf.devices.segment_display.segment_display import \
         SegmentDisplay  # pylint: disable-msg=cyclic-import,unused-import

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/config_spec.yaml

@@ -83,8 +83,8 @@ auditor:
     audit: list|str|None
     autosave: single|bool|true
     autosave_events: single|bool|true
-    events: list|event_handler|None
-    player: list|str|None
+    events: set|event_handler|None
+    player: set|str|None
     audit_shots: single|bool|true
     missing_switch_min_games: single|int|10
     num_player_top_records: single|int|1
@@ -311,6 +311,18 @@ coils:
 custom_code:
     __valid_in__: machine
     __type__: list
+dc_motors:
+    __valid_in__: machine
+    __type__: device
+    default_power: single|float|0.0
+    number: single|str|
+    control_events: dict|str:subconfig(dc_motors_pulse_settings)|None
+    platform: single|str|None
+    platform_settings: single|dict|None
+dc_motors_pulse_settings:
+    action: single|enum(pulse,reverse_pulse,stop)|pulse
+    power: single|float|None
+    duration: single|template_secs|None
 digital_outputs:
     __valid_in__: machine
     __type__: device
@@ -544,7 +556,7 @@ fast:
     __type__: config
     net: single|subconfig(fast_net)|None
     exp: single|subconfig(fast_exp)|None
-    exp_int: single|subconfig(fast_exp)|None    
+    exp_int: single|subconfig(fast_exp)|None
     aud: single|subconfig(fast_aud)|None
     seg: single|subconfig(fast_seg)|None
     dmd: single|subconfig(fast_dmd)|None
@@ -561,7 +573,7 @@ fast_net:
     console_log: single|enum(none,basic,full)|none
     file_log: single|enum(none,basic,full)|basic
     controller: single|enum(neuron,nano,sys11,wpc89,wpc95)|
-    watchdog: single|ms|1000
+    watchdog: single|ms|500
     default_quick_debounce_open: single|ms|2
     default_quick_debounce_close: single|ms|2
     default_normal_debounce_open: single|ms|4
@@ -569,6 +581,8 @@ fast_net:
     mute_unconfigured_switches: single|bool|false
     gi_hz: single|int|30
     lamp_hz: single|int|30
+    soft_power_hold_ms: single|ms|2500
+    soft_power_powerdown_delay: single|ms|4000
 fast_io_loop:
     model: single|str|  # FP-I/O-0804, etc.
     order: single|enum(1,2,3,4,5,6,7,8,9)|
@@ -736,6 +750,7 @@ hardware:
     i2c: list|str|default
     stepper_controllers: list|str|default
     shaker_controllers: list|str|default
+    motor_controllers: list|str|default
     hardware_sound_system: list|str|default
 hardware_sound_systems:
     __valid_in__: machine
@@ -834,7 +849,7 @@ neoseg_displays:
     number_template: single|str|None
     start_x: single|float|None
     start_y: single|float|None
-    size: single|enum(2digit,8digit)|8digit
+    size: single|enum(2digit,8digit,2digit-rg-swapped,8digit-rg-swapped)|8digit
     light_template: single|subconfig(lights,device)|
 lights:
     __valid_in__: machine
@@ -929,6 +944,7 @@ machine:
     __type__: config
     balls_installed: single|int|1
     min_balls: single|int|1
+    soft_shutdown_exit_command: single|str|None
 machine_vars:
     __valid_in__: machine
     __type__: config_dict
@@ -1013,6 +1029,10 @@ mpf:
     paths: ignore
     report_crashes: single|enum(ask,never,always)|never
     rgbw_white_behavior: single|enum(white_only,min_rgb,duck_rgb)|duck_rgb
+data_manager:
+    __valid_in__: machine
+    __type__: config
+    use_fsync: single|bool|None
 multiballs:
     __valid_in__: machine, mode
     __type__: device
@@ -1414,7 +1434,7 @@ settings:
     label: single|str|
     sort: single|int|
     values: dict|str:str|
-    key_type: single|enum(str,float,int)|str
+    key_type: single|enum(str,float,int,bool)|str
     default: single|str|
     machine_var: single|str|None
     settingType: single|str|standard
@@ -1831,15 +1851,6 @@ trinamics_steprocker:
     __valid_in__: machine
     __type__: config
     port: single|str|
-twitch_client:
-    __valid_in__: machine
-    __type__: config
-    user: single|str|None
-    password: single|str|None
-    channel: single|str|None
-    user_var: single|str|None
-    password_var: single|str|None
-    channel_var: single|str|None
 variable_player:
     __valid_in__: machine, mode
     __type__: config_player

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/async_mode.py

@@ -1,13 +1,13 @@
 """Base class for asyncio modes."""
-from typing import Optional
+from typing import Optional, TYPE_CHECKING
 
 import abc
 import asyncio
 
 from mpf.core.mode import Mode
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.core.machine import MachineController  # pylint: disable-msg=cyclic-import,unused-import
 
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/ball_search.py

@@ -1,14 +1,14 @@
 """Implements the ball search procedure."""
 from collections import namedtuple
 
-from typing import List
+from typing import List, TYPE_CHECKING
 
 from mpf.core.delays import DelayManager
 from mpf.core.machine import MachineController
 from mpf.core.mpf_controller import MpfController
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.devices.playfield import Playfield     # pylint: disable-msg=cyclic-import,unused-import
 
 BallSearchCallback = namedtuple("BallSearchCallback", ["priority", "callback", "name", "restore_callback"])

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/bcp/bcp.py

@@ -1,7 +1,7 @@
 """BCP module."""
 import asyncio
 from functools import partial
-from typing import List
+from typing import List, TYPE_CHECKING
 
 from mpf.core.events import QueuedEvent
 from mpf.core.mpf_controller import MpfController
@@ -12,8 +12,8 @@ from mpf.core.utility_functions import Util
 from mpf.core.bcp.bcp_interface import BcpInterface
 from mpf.core.bcp.bcp_transport import BcpTransportManager
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.core.machine import MachineController  # pylint: disable-msg=cyclic-import,unused-import
 
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/bcp/bcp_transport.py

@@ -1,13 +1,13 @@
 """Classes which manage BCP transports."""
 from collections import defaultdict
 
-from typing import Union
+from typing import Union, TYPE_CHECKING
 
 from mpf.core.bcp.bcp_client import BaseBcpClient
 from mpf.core.utility_functions import Util
 
-MYPY = False  # noqa
-if MYPY:
+  # noqa
+if TYPE_CHECKING:
     from mpf.core.machine import MachineController  # pylint: disable-msg=cyclic-import,unused-import
 
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/config_player.py

@@ -3,7 +3,7 @@ import abc
 import asyncio
 import re
 from functools import partial
-from typing import List
+from typing import List, TYPE_CHECKING
 
 from mpf.core.machine import MachineController
 from mpf.core.mode import Mode
@@ -11,8 +11,8 @@ from mpf.core.logging import LogMixin
 from mpf.exceptions.config_file_error import ConfigFileError
 from mpf.core.placeholder_manager import ConditionalEvent
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.core.placeholder_manager import BoolTemplate   # pylint: disable-msg=cyclic-import,unused-import
     from typing import Dict     # pylint: disable-msg=cyclic-import,unused-import
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/config_spec_loader.py

@@ -1,11 +1,13 @@
 """Parse config_spec."""
+from typing import TYPE_CHECKING
+
 from pkg_resources import iter_entry_points
 
 from mpf.core.utility_functions import Util
 from mpf.file_interfaces.yaml_interface import YamlInterface
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.core.device import Device  # pylint: disable-msg=cyclic-import,unused-import
 
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/config_validator.py

@@ -6,8 +6,7 @@ import re
 from collections import namedtuple
 from copy import deepcopy
 
-from typing import Any
-from typing import Dict
+from typing import Any, Dict, TYPE_CHECKING
 
 from mpf.core.config_spec_loader import ConfigSpecLoader
 from mpf.core.rgb_color import NAMED_RGB_COLORS, RGBColor
@@ -15,8 +14,8 @@ from mpf.exceptions.config_file_error import ConfigFileError
 from mpf.file_interfaces.yaml_interface import YamlInterface
 from mpf.core.utility_functions import Util
 
-MYPY = False
-if MYPY:    # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.core.machine import MachineController  # pylint: disable-msg=cyclic-import,unused-import
 
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/data_manager.py

@@ -3,6 +3,7 @@
 import copy
 import os
 import errno
+import sys
 import threading
 import time
 import _thread
@@ -17,10 +18,10 @@ class DataManager(MpfController):
 
     config_name = "data_manager"
 
-    __slots__ = ["name", "min_wait_secs", "filename", "data", "_dirty"]
+    __slots__ = ["config", "name", "min_wait_secs", "filename", "data", "_dirty", "use_fsync"]
 
     def __init__(self, machine, name, min_wait_secs=1):
-        """Initialize data manger.
+        """Initialize data manager.
 
         The DataManager is responsible for reading and writing data to/from a
         file on disk.
@@ -48,6 +49,14 @@ class DataManager(MpfController):
         else:
             raise AssertionError("Invalid path {} for {}".format(config_path, name))
 
+        self.config = self.machine.config_validator.validate_config(
+            "data_manager", self.machine.config.get('data_manager'))
+
+        maybe_use_fsync = self.config.get('use_fsync', None)
+        if maybe_use_fsync is None:
+            maybe_use_fsync = sys.platform != 'win32'
+        self.use_fsync = maybe_use_fsync
+
         self.data = dict()
         self._dirty = threading.Event()
 
@@ -116,29 +125,22 @@ class DataManager(MpfController):
 
     def _writing_thread(self):  # pragma: no cover
         # prevent early writes at start-up
-        data = None
         time.sleep(self.min_wait_secs)
         while not self.machine.thread_stopper.is_set():
             if not self._dirty.wait(1):
                 continue
-            while FileManager.is_busy:
-                time.sleep(0.2)
             self._dirty.clear()
 
-            data = copy.deepcopy(self.data)
             # save data
             try:
-                FileManager.save(self.filename, data)
+                FileManager.save(self.filename, copy.deepcopy(self.data), self.use_fsync)
             except Exception as e:  # pylint: disable=broad-exception-caught
                 # If the file writer has an exception handle it here. Otherwise
                 # this thread will die and all subsequent write attempts will no-op.
                 self.info_log("ERROR writing file %s: %s", self.filename, e)
-            data = None
             # prevent too many writes
             time.sleep(self.min_wait_secs)
 
         # if dirty write data one last time during shutdown
-        if data and self._dirty.is_set():
-            while FileManager.is_busy:
-                time.sleep(0.2)
-            FileManager.save(self.filename, data)
+        if self._dirty.is_set():
+            FileManager.save(self.filename, copy.deepcopy(self.data), self.use_fsync)

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/delays.py

@@ -2,11 +2,11 @@
 
 import uuid
 from functools import partial
-from typing import Any, Callable, Dict, Tuple
+from typing import Any, Callable, Dict, Tuple, TYPE_CHECKING
 from mpf.core.mpf_controller import MpfController
 
-MYPY = False
-if MYPY:    # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.core.machine import MachineController  # pylint: disable-msg=cyclic-import,unused-import
 
 __api__ = ['DelayManager']

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/device.py

@@ -1,13 +1,13 @@
 """Contains the Device base class."""
 import abc
 
-from typing import List, Any, Optional
+from typing import List, Any, Optional, TYPE_CHECKING
 
 from mpf.core.machine import MachineController
 from mpf.core.logging import LogMixin
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.core.mode import Mode      # pylint: disable-msg=cyclic-import,unused-import
     from mpf.core.platform import BasePlatform    # pylint: disable-msg=cyclic-import,unused-import; # noqa
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/device_manager.py

@@ -1,13 +1,13 @@
 """Contains the DeviceManager base class."""
 import asyncio
 
-from typing import Callable, Tuple, List, Generator, Dict
+from typing import Callable, Tuple, List, Generator, Dict, TYPE_CHECKING
 
 from mpf.core.utility_functions import Util
 from mpf.core.mpf_controller import MpfController
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.core.device import Device  # pylint: disable-msg=cyclic-import,unused-import
 
 
@@ -172,7 +172,20 @@ class DeviceManager(MpfController):
             for device_name in config:
                 futures.append(collection[device_name].device_added_system_wide())
 
-        await asyncio.wait([asyncio.create_task(futures) for futures in futures])
+        fs = [asyncio.create_task(future) for future in futures]
+        done, pending = await asyncio.wait(fs, return_when=asyncio.FIRST_EXCEPTION)
+
+        # Check if any of the futures returned an exception and throw it
+        for task in done:
+            if task.cancelled():
+                continue
+
+            exc = task.exception()
+            if exc is not None:
+                for pending_task in pending:
+                    pending_task.cancel()
+                await asyncio.gather(*pending, return_exceptions=True)
+                raise exc
 
     # pylint: disable-msg=too-many-nested-blocks
     def get_device_control_events(self, config) -> Generator[Tuple[str, Callable, int, "Device"], None, None]:

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/enable_disable_mixin.py

@@ -1,5 +1,5 @@
 """Implements enable and disable events for devices."""
-from typing import Optional
+from typing import Optional, TYPE_CHECKING
 
 import abc
 
@@ -12,8 +12,8 @@ from mpf.core.events import event_handler
 from mpf.core.mode_device import ModeDevice
 from mpf.core.machine import MachineController
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.core.mode import Mode  # pylint: disable-msg=cyclic-import,unused-import
     from mpf.core.player import Player  # pylint: disable-msg=cyclic-import,unused-import
 

{mpf-0.81.0.dev2 → mpf-0.81.0.dev4}/mpf/core/events.py

@@ -7,12 +7,12 @@ import asyncio
 from functools import partial, lru_cache
 from unittest.mock import MagicMock
 
-from typing import Dict, Any, Tuple, Optional, Callable, List
+from typing import Dict, Any, Tuple, Optional, Callable, List, TYPE_CHECKING
 
 from mpf.core.mpf_controller import MpfController
 
-MYPY = False
-if MYPY:   # pragma: no cover
+
+if TYPE_CHECKING:
     from mpf.core.machine import MachineController      # pylint: disable-msg=cyclic-import,unused-import
     from mpf.core.placeholder_manager import BaseTemplate   # pylint: disable-msg=cyclic-import,unused-import
     from typing import Deque    # pylint: disable-msg=cyclic-import,unused-import
@@ -224,14 +224,15 @@ class EventManager(MpfController):
                                      'handler you passed?'.format(handler, event))
 
             sig = inspect.signature(handler)
-            if 'kwargs' not in sig.parameters:
-                raise AssertionError("Handler {} for event '{}' is missing **kwargs. Actual signature: {}".format(
-                    handler, event, sig))
-
-            if sig.parameters['kwargs'].kind != inspect.Parameter.VAR_KEYWORD:
-                raise AssertionError("Handler {} for event '{}' param kwargs is missing '**'. "
+            catchall_name = next((name for name in ('kwargs', '_kwargs') if name in sig.parameters), None)
+            if catchall_name is None:
+                raise AssertionError("Handler {} for event '{}' is missing **kwargs. "
                                      "Actual signature: {}".format(handler, event, sig))
 
+            if sig.parameters[catchall_name].kind != inspect.Parameter.VAR_KEYWORD:
+                raise AssertionError("Handler {} for event '{}' param {} is missing '**'. "
+                                     "Actual signature: {}".format(handler, event, catchall_name, sig))
+
         event, condition, additional_priority = self.get_event_and_condition_from_string(event)
         priority += additional_priority
 
@@ -457,6 +458,8 @@ class EventManager(MpfController):
                                                              _future=future,
                                                              _keys=keys,
                                                              event=event_name)))
+
+        future.add_done_callback(lambda f: [self.remove_handler_by_key(k) for k in keys])
         return future
 
     def _wait_handler(self, _future: asyncio.Future, _keys: List[EventHandlerKey], **kwargs):