X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Futils.py;h=77ebe606057aeec6d203df13c1f9af491bf2e8d5;hb=76b6c2f71a485f0cc9b766e1a54b9f7330ccd907;hp=023ff0a8062ef06b2b34be41ccc294d460471dff;hpb=4acc866e829881299a13d0aa8e28b93807549975;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/utils.py b/src/bindings/python/bt2/bt2/utils.py
index 023ff0a8..77ebe606 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
 
 
@@ -117,13 +117,13 @@ 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:
@@ -137,10 +137,10 @@ def _handle_func_status(status, msg=None):
 
     if status == native_bt.__BT_FUNC_STATUS_ERROR:
         assert msg is not None
-        raise bt2.Error(msg)
+        raise bt2._Error(msg)
     elif status == native_bt.__BT_FUNC_STATUS_MEMORY_ERROR:
         assert msg is not None
-        raise bt2.MemoryError(msg)
+        raise bt2._MemoryError(msg)
     elif status == native_bt.__BT_FUNC_STATUS_END:
         if msg is None:
             raise bt2.Stop
@@ -151,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:
+    elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW_ERROR:
         if msg is None:
-            raise bt2.Canceled
+            raise bt2._OverflowError
         else:
-            raise bt2.Canceled(msg)
-    elif status == native_bt.__BT_FUNC_STATUS_LOADING_ERROR:
+            raise bt2._OverflowError(msg)
+    elif status == native_bt.__BT_FUNC_STATUS_UNKNOWN_OBJECT:
         if msg is None:
-            raise bt2.LoadingError
+            raise bt2.UnknownObject
         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)
-    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)
+            raise bt2.UnknownObject(msg)
     else:
         assert False
+
+
+class _ListenerHandle:
+    def __init__(self, listener_id, obj):
+        self._listener_id = listener_id
+        self._obj = obj