bt2: move `_ListenerHandle` to `utils.py`

`_ListenerHandle` is not a name the package's user needs directly, so
move it to the internal `utils.py` instead of having it available as
`bt2._ListenerHandle`.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I11b4476665b358d76379d73d8706dc6146d4b006
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1772
Tested-by: jenkins <jenkins@lttng.org>

diff --git a/src/bindings/python/bt2/bt2/__init__.py.in b/src/bindings/python/bt2/bt2/__init__.py.in
index 7859a22b459889f3b9265df2cbb5928ad346b789..af5cd9513dbaa4be1a9bd8db57a03ebd3b732046 100644 (file)
--- a/src/bindings/python/bt2/bt2/__init__.py.in
+++ b/src/bindings/python/bt2/bt2/__init__.py.in
@@ -138,12 +138,6 @@ class _IncompleteUserClass(Exception):
     pass
 
 
-class _ListenerHandle:
-    def __init__(self, listener_id, obj):
-        self._listener_id = listener_id
-        self._obj = obj
-
-
 def _init_and_register_exit():
     import bt2.native_bt as _native_bt
     import atexit

diff --git a/src/bindings/python/bt2/bt2/graph.py b/src/bindings/python/bt2/bt2/graph.py
index 575747af1ee68096bcbb001c4d47a18c4ca16493..bed266f1b95f9ba15484567fc564178afc80c504 100644 (file)
--- a/src/bindings/python/bt2/bt2/graph.py
+++ b/src/bindings/python/bt2/bt2/graph.py
@@ -150,7 +150,7 @@ class Graph(object._SharedObject):
         if listener_ids is None:
             raise bt2._Error('cannot add listener to graph object')
 
-        return bt2._ListenerHandle(listener_ids, self)
+        return bt2.utils._ListenerHandle(listener_ids, self)
 
     def add_ports_connected_listener(self, listener):
         if not callable(listener):
@@ -165,7 +165,7 @@ class Graph(object._SharedObject):
         if listener_ids is None:
             raise bt2._Error('cannot add listener to graph object')
 
-        return bt2._ListenerHandle(listener_ids, self)
+        return bt2.utils._ListenerHandle(listener_ids, self)
 
     def run(self):
         status = native_bt.graph_run(self._ptr)

diff --git a/src/bindings/python/bt2/bt2/trace.py b/src/bindings/python/bt2/bt2/trace.py
index a90b53ce9433352d33bae6a7308f167b3088db12..db8268db1cf82cb4473f941ba518ac6891358b87 100644 (file)
--- a/src/bindings/python/bt2/bt2/trace.py
+++ b/src/bindings/python/bt2/bt2/trace.py
@@ -190,4 +190,4 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
             status, 'cannot add destruction listener to trace object'
         )
 
-        return bt2._ListenerHandle(listener_id, self)
+        return bt2.utils._ListenerHandle(listener_id, self)

diff --git a/src/bindings/python/bt2/bt2/trace_class.py b/src/bindings/python/bt2/bt2/trace_class.py
index 5c4da5c7086670b3e4d2e4e71cd5a6b1bff39bf3..d349ac0a44fa5629325be6da8eb06536bdfbacf1 100644 (file)
--- a/src/bindings/python/bt2/bt2/trace_class.py
+++ b/src/bindings/python/bt2/bt2/trace_class.py
@@ -339,4 +339,4 @@ class _TraceClass(object._SharedObject, collections.abc.Mapping):
             status, 'cannot add destruction listener to trace class object'
         )
 
-        return bt2._ListenerHandle(listener_id, self)
+        return bt2.utils._ListenerHandle(listener_id, self)

diff --git a/src/bindings/python/bt2/bt2/utils.py b/src/bindings/python/bt2/bt2/utils.py
index 3ad4f0b502fe74f3167cc38b010778b3d5a798b6..8db257ae16a8884a750ea41013c3f893c0288324 100644 (file)
--- a/src/bindings/python/bt2/bt2/utils.py
+++ b/src/bindings/python/bt2/bt2/utils.py
@@ -163,3 +163,9 @@ def _handle_func_status(status, msg=None):
             raise bt2.InvalidObject(msg)
     else:
         assert False
+
+
+class _ListenerHandle:
+    def __init__(self, listener_id, obj):
+        self._listener_id = listener_id
+        self._obj = obj