Skip to content

Swallowing a BaseException is not allowed. #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Swallowing a BaseException is not allowed. #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions transitions/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ def _trigger(self, event_data):
event_data.error = err
if self.machine.on_exception:
self.machine.callbacks(self.machine.on_exception, event_data)
else:
if not self.machine.on_exception or not isinstance(err, Exception):
raise
finally:
try:
Expand Down Expand Up @@ -917,7 +917,7 @@ def _can_trigger(self, model, trigger, *args, **kwargs):
event_data.error = err
if self.on_exception:
self.callbacks(self.on_exception, event_data)
else:
if not self.on_exception or not isinstance(err, BaseException):
raise
return False

Expand Down
29 changes: 20 additions & 9 deletions transitions/extensions/asyncio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
from collections import deque
from functools import partial, reduce
import copy
from concurrent.futures import CancelledError

from ..core import State, Condition, Transition, EventData, listify
from ..core import Event, MachineError, Machine
Expand Down Expand Up @@ -197,20 +198,25 @@ async def _trigger(self, event_data):
except BaseException as err: # pylint: disable=broad-except; Exception will be handled elsewhere
_LOGGER.error("%sException was raised while processing the trigger '%s': %s",
self.machine.name, event_data.event.name, repr(err))
event_data.error = err
event_data.error = err if isinstance(err,Exception) else CancelledError()

if self.machine.on_exception:
await self.machine.callbacks(self.machine.on_exception, event_data)
else:
with anyio.move_on_after(2, shield=True):
await self.machine.callbacks(self.machine.on_exception, event_data)
if not self.machine.on_exception or not isinstance(err, Exception):
raise
finally:
try:
await self.machine.callbacks(self.machine.finalize_event, event_data)
with anyio.CancelScope(shield=True):
await self.machine.callbacks(self.machine.finalize_event, event_data)
_LOGGER.debug("%sExecuted machine finalize callbacks", self.machine.name)
except BaseException as err: # pylint: disable=broad-except; Exception will be handled elsewhere
_LOGGER.error("%sWhile executing finalize callbacks a %s occurred: %s.",
self.machine.name,
type(err).__name__,
str(err))
if not isinstance(err, Exception):
raise
return event_data.result

async def _process(self, event_data):
Expand Down Expand Up @@ -481,7 +487,7 @@ async def _can_trigger(self, model, trigger, *args, **kwargs):
event_data.error = err
if self.on_exception:
await self.callbacks(self.on_exception, event_data)
else:
if not self.on_exception or not isinstance(err, Exception):
raise
return False

Expand Down Expand Up @@ -556,7 +562,7 @@ async def _trigger_event(self, event_data, trigger):
event_data.error = err
if self.on_exception:
await self.callbacks(self.on_exception, event_data)
else:
if not self.on_exception or not isinstance(err, Exception):
raise
finally:
try:
Expand All @@ -567,6 +573,8 @@ async def _trigger_event(self, event_data, trigger):
self.name,
type(err).__name__,
str(err))
if not isinstance(err, Exception):
raise
return event_data.result

async def _trigger_event_nested(self, event_data, _trigger, _state_tree):
Expand Down Expand Up @@ -616,7 +624,7 @@ async def _can_trigger_nested(self, model, trigger, path, *args, **kwargs):
event_data.error = err
if self.on_exception:
await self.callbacks(self.on_exception, event_data)
else:
if not self.on_exception or not isinstance(err, Exception):
raise
source_path.pop(-1)
if path:
Expand Down Expand Up @@ -711,16 +719,19 @@ async def _process_timeout(self, event_data):
except BaseException as err:
_LOGGER.warning("%sException raised while processing timeout!",
event_data.machine.name)
event_data.error = err
event_data.error = err if isinstance(err,Exception) else CancelledError()
try:
if event_data.machine.on_exception:
await event_data.machine.callbacks(event_data.machine.on_exception, event_data)
else:
# always re-raise BaseException!
if not event_data.machine.on_exception or not isinstance(err, Exception):
raise
except BaseException as err2:
_LOGGER.error("%sHandling timeout exception '%s' caused another exception: %s. "
"Cancel running transitions...", event_data.machine.name, repr(err), repr(err2))
await event_data.machine.cancel_running_transitions(event_data.model)
if not isinstance(err, Exception):
raise
finally:
AsyncMachine.current_context.reset(token)
_LOGGER.info("%sTimeout state %s processed.", event_data.machine.name, self.name)
Expand Down
6 changes: 4 additions & 2 deletions transitions/extensions/nesting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ def _can_trigger_nested(self, model, trigger, path, *args, **kwargs):
event_data.error = err
if self.on_exception:
self.callbacks(self.on_exception, event_data)
else:
if not self.on_exception or not isinstance(err, Exception):
raise
source_path.pop(-1)
if path:
Expand Down Expand Up @@ -916,7 +916,7 @@ def _trigger_event(self, event_data, trigger):
event_data.error = err
if self.on_exception:
self.callbacks(self.on_exception, event_data)
else:
if not self.on_exception or not isinstance(err, Exception):
raise
finally:
try:
Expand All @@ -927,6 +927,8 @@ def _trigger_event(self, event_data, trigger):
self.name,
type(err).__name__,
str(err))
if not isinstance(err, Exception):
raise
return event_data.result

def _add_model_to_state(self, state, model):
Expand Down