X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Futils.py;h=bd4dd7a9406c3749dc1e5865d98e6f560326769e;hb=2c1d3e9111d8f1b55361b9b880350c2680c90093;hp=39b5f809dbd608e981885065a7a13c56c06fe0e5;hpb=416379bc0706641778bba7efbebaa5c6027e81b8;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/utils.py b/src/bindings/python/bt2/bt2/utils.py index 39b5f809..bd4dd7a9 100644 --- a/src/bindings/python/bt2/bt2/utils.py +++ b/src/bindings/python/bt2/bt2/utils.py @@ -135,14 +135,12 @@ def _handle_func_status(status, msg=None): # no error return - if ( - status == native_bt.__BT_FUNC_STATUS_ERROR - or status == native_bt.__BT_FUNC_STATUS_MEMORY_ERROR - ): - if msg is None: - raise bt2.Error - else: - raise bt2.Error(msg) + if status == native_bt.__BT_FUNC_STATUS_ERROR: + assert msg is not None + raise bt2._Error(msg) + elif status == native_bt.__BT_FUNC_STATUS_MEMORY_ERROR: + assert msg is not None + raise bt2._MemoryError(msg) elif status == native_bt.__BT_FUNC_STATUS_END: if msg is None: raise bt2.Stop @@ -158,11 +156,6 @@ def _handle_func_status(status, msg=None): raise bt2.Canceled else: raise bt2.Canceled(msg) - elif status == native_bt.__BT_FUNC_STATUS_LOADING_ERROR: - if msg is None: - raise bt2.LoadingError - else: - raise bt2.LoadingError(msg) elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW: if msg is None: raise bt2.OverflowError @@ -178,10 +171,5 @@ def _handle_func_status(status, msg=None): raise bt2.InvalidParams else: raise bt2.InvalidParams(msg) - elif status == native_bt.__BT_FUNC_STATUS_UNSUPPORTED: - if msg is None: - raise bt2.Unsupported - else: - raise bt2.Unsupported(msg) else: assert False