X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bindings%2Fpython%2Fbt2%2Fbt2%2Fquery_executor.py;h=f90bb902651cf5fb98c2b43bcab052c35068f250;hb=601c002660cfc2434293a50a1bec418a6b41fdaf;hp=db7db61028d73a9cce32ba19bdab2fec5b3b8663;hpb=752d0e479c6f7b1d4a5abcfa4ddf8dc0734d2e10;p=babeltrace.git

diff --git a/bindings/python/bt2/bt2/query_executor.py b/bindings/python/bt2/bt2/query_executor.py
index db7db610..f90bb902 100644
--- a/bindings/python/bt2/bt2/query_executor.py
+++ b/bindings/python/bt2/bt2/query_executor.py
@@ -26,14 +26,17 @@ import bt2
 
 
 class QueryExecutor(object._SharedObject):
+    _get_ref = native_bt.query_executor_get_ref
+    _put_ref = native_bt.query_executor_put_ref
+
     def _handle_status(self, status, gen_error_msg):
-        if status == native_bt.QUERY_STATUS_AGAIN:
+        if status == native_bt.QUERY_EXECUTOR_STATUS_AGAIN:
             raise bt2.TryAgain
-        elif status == native_bt.QUERY_STATUS_EXECUTOR_CANCELED:
+        elif status == native_bt.QUERY_EXECUTOR_STATUS_CANCELED:
             raise bt2.QueryExecutorCanceled
-        elif status == native_bt.QUERY_STATUS_INVALID_OBJECT:
+        elif status == native_bt.QUERY_EXECUTOR_STATUS_INVALID_OBJECT:
             raise bt2.InvalidQueryObject
-        elif status == native_bt.QUERY_STATUS_INVALID_PARAMS:
+        elif status == native_bt.QUERY_EXECUTOR_STATUS_INVALID_PARAMS:
             raise bt2.InvalidQueryParams
         elif status < 0:
             raise bt2.Error(gen_error_msg)
@@ -78,10 +81,7 @@ class QueryExecutor(object._SharedObject):
             params = bt2.create_value(params)
             params_ptr = params._ptr
 
-        if isinstance(component_class, bt2.component._GenericComponentClass):
-            cc_ptr = component_class._ptr
-        else:
-            cc_ptr = component_class._cc_ptr
+        cc_ptr = component_class._component_class_ptr()
 
         status, result_ptr = native_bt.query_executor_query(self._ptr, cc_ptr,
                                                             object, params_ptr)