X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Futils.py;h=a3df357ee47d2184cb82d7a8d070f154c4583250;hb=07041dafaae18146e189a70c33a8a0695cbdd813;hp=2da3c31902ebc17d5d9b5adf1316a2dab52f1626;hpb=5ae9f1bf3332a2dff16e6e811b982f0b5602dc47;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/utils.py b/src/bindings/python/bt2/bt2/utils.py
index 2da3c319..a3df357e 100644
--- a/src/bindings/python/bt2/bt2/utils.py
+++ b/src/bindings/python/bt2/bt2/utils.py
@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 import bt2
-import bt2.logging
+from bt2 import logging as bt2_logging
 from bt2 import native_bt
 
 
@@ -113,24 +113,17 @@ def _check_alignment(a):
         raise ValueError('{} is not a power of two'.format(a))
 
 
-def _raise_bt2_error(msg):
-    if msg is None:
-        raise bt2.Error
-    else:
-        raise bt2.Error(msg)
-
-
 def _check_log_level(log_level):
     _check_int(log_level)
 
     log_levels = (
-        bt2.logging.LoggingLevel.TRACE,
-        bt2.logging.LoggingLevel.DEBUG,
-        bt2.logging.LoggingLevel.INFO,
-        bt2.logging.LoggingLevel.WARNING,
-        bt2.logging.LoggingLevel.ERROR,
-        bt2.logging.LoggingLevel.FATAL,
-        bt2.logging.LoggingLevel.NONE,
+        bt2_logging.LoggingLevel.TRACE,
+        bt2_logging.LoggingLevel.DEBUG,
+        bt2_logging.LoggingLevel.INFO,
+        bt2_logging.LoggingLevel.WARNING,
+        bt2_logging.LoggingLevel.ERROR,
+        bt2_logging.LoggingLevel.FATAL,
+        bt2_logging.LoggingLevel.NONE,
     )
 
     if log_level not in log_levels:
@@ -142,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
@@ -160,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:
+    elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW_ERROR:
         if msg is None:
-            raise bt2.LoadingError
+            raise bt2._OverflowError
         else:
-            raise bt2.LoadingError(msg)
-    elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW:
-        if msg is None:
-            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