X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fquery_executor.py;h=17ddd97e86fd3d86563ad618266acf540637a1ce;hb=cfbd7cf3bde05e8a6606478889dcd663604ef7b5;hp=072410fbbd481c4cc2122de971228b27c96355e0;hpb=f4e38e70bf6dc1ff8c9226d9c8eedaf26fa19f09;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/query_executor.py b/src/bindings/python/bt2/bt2/query_executor.py
index 072410fb..17ddd97e 100644
--- a/src/bindings/python/bt2/bt2/query_executor.py
+++ b/src/bindings/python/bt2/bt2/query_executor.py
@@ -30,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()
 
@@ -52,18 +40,23 @@ 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):
         is_canceled = native_bt.query_executor_is_canceled(self._ptr)
-        assert(is_canceled >= 0)
+        assert is_canceled >= 0
         return is_canceled > 0
 
-    def query(self, component_class, object, params=None,
-              logging_level=bt2.logging.LoggingLevel.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
@@ -87,11 +80,11 @@ class QueryExecutor(object._SharedObject):
             params_ptr = params._ptr
 
         utils._check_log_level(logging_level)
-        cc_ptr = component_class._component_class_ptr()
+        cc_ptr = component_class._bt_component_class_ptr()
 
-        status, result_ptr = native_bt.query_executor_query(self._ptr, cc_ptr,
-                                                            object, params_ptr,
-                                                            logging_level)
-        self._handle_status(status, 'cannot query component class')
-        assert(result_ptr)
+        status, result_ptr = native_bt.query_executor_query(
+            self._ptr, cc_ptr, 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)