lib: strictly type function return status enumerations

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

diff --git a/src/bindings/python/bt2/bt2/query_executor.py b/src/bindings/python/bt2/bt2/query_executor.py
index a87713ff1c8a4f2c540fb35fabd81592cd910692..f0e984efc2ecc48b86e93d78423234026c4f836c 100644 (file)
--- a/src/bindings/python/bt2/bt2/query_executor.py
+++ b/src/bindings/python/bt2/bt2/query_executor.py
@@ -22,6 +22,7 @@
 
 from bt2 import native_bt, object, utils
 import bt2.component
+import bt2.logging
 import bt2
 
 
@@ -29,18 +30,6 @@ class QueryExecutor(object._SharedObject):
     _get_ref = staticmethod(native_bt.query_executor_get_ref)
     _put_ref = staticmethod(native_bt.query_executor_put_ref)
 
-    def _handle_status(self, status, gen_error_msg):
-        if status == native_bt.QUERY_EXECUTOR_STATUS_AGAIN:
-            raise bt2.TryAgain
-        elif status == native_bt.QUERY_EXECUTOR_STATUS_CANCELED:
-            raise bt2.QueryExecutorCanceled
-        elif status == native_bt.QUERY_EXECUTOR_STATUS_INVALID_OBJECT:
-            raise bt2.InvalidQueryObject
-        elif status == native_bt.QUERY_EXECUTOR_STATUS_INVALID_PARAMS:
-            raise bt2.InvalidQueryParams
-        elif status < 0:
-            raise bt2.Error(gen_error_msg)
-
     def __init__(self):
         ptr = native_bt.query_executor_create()
 
@@ -51,7 +40,8 @@ class QueryExecutor(object._SharedObject):
 
     def cancel(self):
         status = native_bt.query_executor_cancel(self._ptr)
-        self._handle_status(status, 'cannot cancel query executor object')
+        utils._handle_func_status(status,
+                                  'cannot cancel query executor object')
 
     @property
     def is_canceled(self):
@@ -59,9 +49,10 @@ class QueryExecutor(object._SharedObject):
         assert(is_canceled >= 0)
         return is_canceled > 0
 
-    def query(self, component_class, object, params=None):
+    def query(self, component_class, object, params=None,
+              logging_level=bt2.logging.LoggingLevel.NONE):
         if self.is_canceled:
-            raise bt2.QueryExecutorCanceled
+            raise bt2.Canceled
 
         if not isinstance(component_class, bt2.component._GenericComponentClass):
             err = False
@@ -84,10 +75,12 @@ class QueryExecutor(object._SharedObject):
             params = bt2.create_value(params)
             params_ptr = params._ptr
 
+        utils._check_log_level(logging_level)
         cc_ptr = component_class._component_class_ptr()
 
         status, result_ptr = native_bt.query_executor_query(self._ptr, cc_ptr,
-                                                            object, params_ptr)
-        self._handle_status(status, 'cannot query component class')
+                                                            object, params_ptr,
+                                                            logging_level)
+        utils._handle_func_status(status, 'cannot query component class')
         assert(result_ptr)
         return bt2.value._create_from_ptr(result_ptr)