X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt_component_class.i;h=e71e6bf8e7ed4d1f3e6328fe113ad6ef07e48569;hb=6a91742b3a25285222551341c8a134b4b2b5aba9;hp=bba59883329bf6afb1abef7de26c20ceb37003b1;hpb=a635e50750a3c1e8907b38c8311dc0b8bb0f09c3;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/native_bt_component_class.i b/src/bindings/python/bt2/bt2/native_bt_component_class.i
index bba59883..e71e6bf8 100644
--- a/src/bindings/python/bt2/bt2/native_bt_component_class.i
+++ b/src/bindings/python/bt2/bt2/native_bt_component_class.i
@@ -573,19 +573,19 @@ void component_class_finalize(bt_self_component *self_component)
 	PyObject *py_comp = bt_self_component_get_data(self_component);
 	BT_ASSERT(py_comp);
 
-	/* Call user's _finalize() method */
+	/* Call user's _user_finalize() method */
 	PyObject *py_method_result = PyObject_CallMethod(py_comp,
-		"_finalize", NULL);
+		"_user_finalize", NULL);
 
 	if (PyErr_Occurred()) {
-		BT_LOGW("User component's _finalize() method raised an exception: ignoring:");
+		BT_LOGW("User component's _user_finalize() method raised an exception: ignoring:");
 		logw_exception();
 	}
 
 	/*
-	 * Ignore any exception raised by the _finalize() method because
-	 * it won't change anything at this point: the component is
-	 * being destroyed anyway.
+	 * Ignore any exception raised by the _user_finalize() method
+	 * because it won't change anything at this point: the component
+	 * is being destroyed anyway.
 	 */
 	PyErr_Clear();
 	Py_XDECREF(py_method_result);
@@ -1084,19 +1084,19 @@ void component_class_message_iterator_finalize(
 
 	BT_ASSERT(py_message_iter);
 
-	/* Call user's _finalize() method */
+	/* Call user's _user_finalize() method */
 	py_method_result = PyObject_CallMethod(py_message_iter,
-		"_finalize", NULL);
+		"_user_finalize", NULL);
 
 	if (PyErr_Occurred()) {
-		BT_LOGW("User's _finalize() method raised an exception: ignoring:");
+		BT_LOGW("User's _user_finalize() method raised an exception: ignoring:");
 		logw_exception();
 	}
 
 	/*
-	 * Ignore any exception raised by the _finalize() method because
-	 * it won't change anything at this point: the component is
-	 * being destroyed anyway.
+	 * Ignore any exception raised by the _user_finalize() method
+	 * because it won't change anything at this point: the component
+	 * is being destroyed anyway.
 	 */
 	PyErr_Clear();
 	Py_XDECREF(py_method_result);
@@ -1153,11 +1153,11 @@ component_class_sink_consume(bt_self_component_sink *self_component_sink)
 
 	BT_ASSERT(py_comp);
 	py_method_result = PyObject_CallMethod(py_comp,
-		"_consume", NULL);
+		"_user_consume", NULL);
 	status = py_exc_to_status_component(self_component);
 	if (!py_method_result && status == __BT_FUNC_STATUS_OK) {
 		/* Pretty sure this should never happen, but just in case */
-		BT_LOGE("User's _consume() method failed without raising an exception: "
+		BT_LOGE("User's _user_consume() method failed without raising an exception: "
 			"status=%d", status);
 		status = __BT_FUNC_STATUS_ERROR;
 	}