lib: remove LOADING_ERROR status

[babeltrace.git] / src / bindings / python / bt2 / bt2 / utils.py

diff --git a/src/bindings/python/bt2/bt2/utils.py b/src/bindings/python/bt2/bt2/utils.py
index 4c0c2d9103137698f4a11b04ac225c4f20ff3991..5cbbb89b2ed55983aceaa7bb8100552c3294e3e0 100644 (file)
--- a/src/bindings/python/bt2/bt2/utils.py
+++ b/src/bindings/python/bt2/bt2/utils.py
@@ -47,13 +47,14 @@ def _check_str(o):
 
 def _check_type(o, expected_type):
     if not isinstance(o, expected_type):
-        raise TypeError("'{}' is not a '{}' object".format(o.__class__.__name__,
-                                                           expected_type))
+        raise TypeError(
+            "'{}' is not a '{}' object".format(o.__class__.__name__, expected_type)
+        )
 
 
 def _is_in_int64_range(v):
-    assert(isinstance(v, int))
-    return v >= -(2**63) and v <= (2**63 - 1)
+    assert isinstance(v, int)
+    return v >= -(2 ** 63) and v <= (2 ** 63 - 1)
 
 
 def _is_int64(v):
@@ -64,8 +65,8 @@ def _is_int64(v):
 
 
 def _is_in_uint64_range(v):
-    assert(isinstance(v, int))
-    return v >= 0 and v <= (2**64 - 1)
+    assert isinstance(v, int)
+    return v >= 0 and v <= (2 ** 64 - 1)
 
 
 def _is_uint64(v):
@@ -112,18 +113,6 @@ 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 _handle_ptr(ptr, msg=None):
-    if ptr is None:
-        _raise_bt2_error(msg)
-
-
 def _check_log_level(log_level):
     _check_int(log_level)
 
@@ -131,7 +120,7 @@ def _check_log_level(log_level):
         bt2.logging.LoggingLevel.TRACE,
         bt2.logging.LoggingLevel.DEBUG,
         bt2.logging.LoggingLevel.INFO,
-        bt2.logging.LoggingLevel.WARN,
+        bt2.logging.LoggingLevel.WARNING,
         bt2.logging.LoggingLevel.ERROR,
         bt2.logging.LoggingLevel.FATAL,
         bt2.logging.LoggingLevel.NONE,
@@ -146,11 +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
@@ -166,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