X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fquery_executor.py;h=840e0fdd867135bb4e00c06487494bb067c7b297;hb=9dee90bdad3dac00a1caff5c9a1e58fb284ee19d;hp=2f82d16b4d3baba67281c2e1d5b6830cedbf8e02;hpb=7993562851b443afb3801e5bf2b88d674734808b;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/query_executor.py b/src/bindings/python/bt2/bt2/query_executor.py
index 2f82d16b..840e0fdd 100644
--- a/src/bindings/python/bt2/bt2/query_executor.py
+++ b/src/bindings/python/bt2/bt2/query_executor.py
@@ -1,24 +1,6 @@
-# The MIT License (MIT)
+# SPDX-License-Identifier: MIT
 #
 # Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
 
 from bt2 import native_bt, object, utils
 from bt2 import interrupter as bt2_interrupter
@@ -48,13 +30,18 @@ class _QueryExecutorCommon:
 
 
 class QueryExecutor(object._SharedObject, _QueryExecutorCommon):
-    _get_ref = staticmethod(native_bt.query_executor_get_ref)
-    _put_ref = staticmethod(native_bt.query_executor_put_ref)
+    @staticmethod
+    def _get_ref(ptr):
+        native_bt.query_executor_get_ref(ptr)
+
+    @staticmethod
+    def _put_ref(ptr):
+        native_bt.query_executor_put_ref(ptr)
 
     def _as_query_executor_ptr(self):
         return self._ptr
 
-    def __init__(self, component_class, object, params=None, method_obj=None):
+    def __init__(self, component_class, object_name, params=None, method_obj=None):
         if not isinstance(component_class, _bt2_component()._ComponentClassConst):
             err = False
 
@@ -68,7 +55,7 @@ class QueryExecutor(object._SharedObject, _QueryExecutorCommon):
                 o = component_class
                 raise TypeError("'{}' is not a component class object".format(o))
 
-        utils._check_str(object)
+        utils._check_str(object_name)
 
         if params is None:
             params_ptr = native_bt.value_null
@@ -83,15 +70,15 @@ class QueryExecutor(object._SharedObject, _QueryExecutorCommon):
             cc_ptr
         ):
             raise ValueError(
-                'cannot pass a Python object to a non-Python component class'
+                "cannot pass a Python object to a non-Python component class"
             )
 
         ptr = native_bt.bt2_query_executor_create(
-            cc_ptr, object, params_ptr, method_obj
+            cc_ptr, object_name, params_ptr, method_obj
         )
 
         if ptr is None:
-            raise bt2._MemoryError('cannot create query executor object')
+            raise bt2._MemoryError("cannot create query executor object")
 
         super().__init__(ptr)
 
@@ -104,8 +91,10 @@ class QueryExecutor(object._SharedObject, _QueryExecutorCommon):
         utils._check_type(interrupter, bt2_interrupter.Interrupter)
         native_bt.query_executor_add_interrupter(self._ptr, interrupter._ptr)
 
-    def interrupt(self):
-        native_bt.query_executor_interrupt(self._ptr)
+    @property
+    def default_interrupter(self):
+        ptr = native_bt.query_executor_borrow_default_interrupter(self._ptr)
+        return bt2_interrupter.Interrupter._create_from_ptr_and_get_ref(ptr)
 
     def _set_logging_level(self, log_level):
         utils._check_log_level(log_level)
@@ -123,7 +112,7 @@ class QueryExecutor(object._SharedObject, _QueryExecutorCommon):
 
     def query(self):
         status, result_ptr = native_bt.query_executor_query(self._ptr)
-        utils._handle_func_status(status, 'cannot query component class')
+        utils._handle_func_status(status, "cannot query component class")
         assert result_ptr is not None
         return bt2_value._create_from_const_ptr(result_ptr)
 
@@ -134,7 +123,7 @@ class _PrivateQueryExecutor(_QueryExecutorCommon):
 
     def _check_validity(self):
         if self._ptr is None:
-            raise RuntimeError('this object is not valid anymore')
+            raise RuntimeError("this object is not valid anymore")
 
     def _as_query_executor_ptr(self):
         self._check_validity()