X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Futils.py;h=8db257ae16a8884a750ea41013c3f893c0288324;hb=90ab1cfa06fc5b2d195a907361d3cee8b5646b44;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..8db257ae 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
@@ -153,35 +151,21 @@ def _handle_func_status(status, msg=None):
             raise bt2.TryAgain
         else:
             raise bt2.TryAgain(msg)
-    elif status == native_bt.__BT_FUNC_STATUS_CANCELED:
-        if msg is 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:
+    elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW_ERROR:
         if msg is None:
-            raise bt2.OverflowError
+            raise bt2._OverflowError
         else:
-            raise bt2.OverflowError(msg)
+            raise bt2._OverflowError(msg)
     elif status == native_bt.__BT_FUNC_STATUS_INVALID_OBJECT:
         if msg is None:
             raise bt2.InvalidObject
         else:
             raise bt2.InvalidObject(msg)
-    elif status == native_bt.__BT_FUNC_STATUS_INVALID_PARAMS:
-        if msg is 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
+
+
+class _ListenerHandle:
+    def __init__(self, listener_id, obj):
+        self._listener_id = listener_id
+        self._obj = obj