bt2: Add `Const` suffix to `_*Port` classes and adapt tests

[babeltrace.git] / src / bindings / python / bt2 / bt2 / port.py

diff --git a/src/bindings/python/bt2/bt2/port.py b/src/bindings/python/bt2/bt2/port.py
index 1d649b35d72f4a6ec8a15a871cfec5400e8e5185..94738d850bd9d576036dee7e929858421b174845 100644 (file)
--- a/src/bindings/python/bt2/bt2/port.py
+++ b/src/bindings/python/bt2/bt2/port.py
@@ -21,14 +21,10 @@
 # THE SOFTWARE.
 
 from bt2 import native_bt, object
-import bt2.component
-import bt2.connection
-import bt2.message_iterator
-import bt2.message
-import bt2
+from bt2 import connection as bt2_connection
 
 
-def _create_from_ptr_and_get_ref(ptr, port_type):
+def _create_from_const_ptr_and_get_ref(ptr, port_type):
     cls = _PORT_TYPE_TO_PYCLS.get(port_type, None)
 
     if cls is None:
@@ -46,7 +42,7 @@ def _create_self_from_ptr_and_get_ref(ptr, port_type):
     return cls._create_from_ptr_and_get_ref(ptr)
 
 
-class _Port(object._SharedObject):
+class _PortConst(object._SharedObject):
     @classmethod
     def _get_ref(cls, ptr):
         ptr = cls._as_port_ptr(ptr)
@@ -72,22 +68,22 @@ class _Port(object._SharedObject):
         if conn_ptr is None:
             return
 
-        return bt2.connection._Connection._create_from_ptr_and_get_ref(conn_ptr)
+        return bt2_connection._ConnectionConst._create_from_ptr_and_get_ref(conn_ptr)
 
     @property
     def is_connected(self):
         return self.connection is not None
 
 
-class _InputPort(_Port):
+class _InputPortConst(_PortConst):
     _as_port_ptr = staticmethod(native_bt.port_input_as_port_const)
 
 
-class _OutputPort(_Port):
+class _OutputPortConst(_PortConst):
     _as_port_ptr = staticmethod(native_bt.port_output_as_port_const)
 
 
-class _UserComponentPort(_Port):
+class _UserComponentPort(_PortConst):
     @classmethod
     def _as_port_ptr(cls, ptr):
         ptr = cls._as_self_port_ptr(ptr)
@@ -101,7 +97,7 @@ class _UserComponentPort(_Port):
         if conn_ptr is None:
             return
 
-        return bt2.connection._Connection._create_from_ptr_and_get_ref(conn_ptr)
+        return bt2_connection._ConnectionConst._create_from_ptr_and_get_ref(conn_ptr)
 
     @property
     def user_data(self):
@@ -109,30 +105,21 @@ class _UserComponentPort(_Port):
         return native_bt.self_component_port_get_data(ptr)
 
 
-class _UserComponentInputPort(_UserComponentPort, _InputPort):
+class _UserComponentInputPort(_UserComponentPort, _InputPortConst):
     _as_self_port_ptr = staticmethod(
         native_bt.self_component_port_input_as_self_component_port
     )
 
-    def create_message_iterator(self):
-        msg_iter_ptr = native_bt.self_component_port_input_message_iterator_create(
-            self._ptr
-        )
-        if msg_iter_ptr is None:
-            raise bt2.CreationError('cannot create message iterator object')
 
-        return bt2.message_iterator._UserComponentInputPortMessageIterator(msg_iter_ptr)
-
-
-class _UserComponentOutputPort(_UserComponentPort, _OutputPort):
+class _UserComponentOutputPort(_UserComponentPort, _OutputPortConst):
     _as_self_port_ptr = staticmethod(
         native_bt.self_component_port_output_as_self_component_port
     )
 
 
 _PORT_TYPE_TO_PYCLS = {
-    native_bt.PORT_TYPE_INPUT: _InputPort,
-    native_bt.PORT_TYPE_OUTPUT: _OutputPort,
+    native_bt.PORT_TYPE_INPUT: _InputPortConst,
+    native_bt.PORT_TYPE_OUTPUT: _OutputPortConst,
 }