From 0b9ddc0046b188a981058d9113fa1641141ecea9 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 17 Dec 2019 21:54:38 -0500 Subject: [PATCH] bt2: rename `object` parameter -> `object_name` I think it's more evident this way. Signed-off-by: Philippe Proulx Change-Id: I20f80ab8b28c4f4f0d390dd9fb4676ff69e8e609 Reviewed-on: https://review.lttng.org/c/babeltrace/+/2712 Tested-by: jenkins --- src/bindings/python/bt2/bt2/component.py | 8 +++++--- src/bindings/python/bt2/bt2/query_executor.py | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bindings/python/bt2/bt2/component.py b/src/bindings/python/bt2/bt2/component.py index 980a0d45..9ccd6452 100644 --- a/src/bindings/python/bt2/bt2/component.py +++ b/src/bindings/python/bt2/bt2/component.py @@ -613,7 +613,9 @@ class _UserComponentType(type): def _user_get_supported_mip_versions(cls, params, obj, log_level): return [0] - def _bt_query_from_native(cls, priv_query_exec_ptr, object, params_ptr, method_obj): + def _bt_query_from_native( + cls, priv_query_exec_ptr, object_name, params_ptr, method_obj + ): # this can raise, but the native side checks the exception if params_ptr is not None: params = bt2_value._create_from_const_ptr_and_get_ref(params_ptr) @@ -624,7 +626,7 @@ class _UserComponentType(type): try: # this can raise, but the native side checks the exception - results = cls._user_query(priv_query_exec, object, params, method_obj) + results = cls._user_query(priv_query_exec, object_name, params, method_obj) finally: # the private query executor is a private view on the query # executor; it's not a shared object (the library does not @@ -646,7 +648,7 @@ class _UserComponentType(type): bt2_value._Value._get_ref(results_ptr) return int(results_ptr) - def _user_query(cls, priv_query_executor, object, params, method_obj): + def _user_query(cls, priv_query_executor, object_name, params, method_obj): raise bt2.UnknownObject def _bt_component_class_ptr(self): diff --git a/src/bindings/python/bt2/bt2/query_executor.py b/src/bindings/python/bt2/bt2/query_executor.py index 57c32589..0b4cbc2f 100644 --- a/src/bindings/python/bt2/bt2/query_executor.py +++ b/src/bindings/python/bt2/bt2/query_executor.py @@ -54,7 +54,7 @@ class QueryExecutor(object._SharedObject, _QueryExecutorCommon): 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 +68,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 @@ -87,7 +87,7 @@ class QueryExecutor(object._SharedObject, _QueryExecutorCommon): ) 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: -- 2.34.1