lib: remove output port message iterator

[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 f7c236692e23d35951c00b85375ef58a887d9831..418f215b8952162cc6cc98bda6aedc3aa6f33f60 100644 (file)
--- a/src/bindings/python/bt2/bt2/port.py
+++ b/src/bindings/python/bt2/bt2/port.py
@@ -21,10 +21,9 @@
 # THE SOFTWARE.
 
 from bt2 import native_bt, object
-import bt2.component
-import bt2.connection
-import bt2.message_iterator
-import bt2.message
+from bt2 import component as bt2_component
+from bt2 import connection as bt2_connection
+from bt2 import message as bt2_message
 import bt2
 
 
@@ -32,7 +31,7 @@ def _create_from_ptr_and_get_ref(ptr, port_type):
     cls = _PORT_TYPE_TO_PYCLS.get(port_type, None)
 
     if cls is None:
-        raise bt2.Error('unknown port type: {}'.format(port_type))
+        raise TypeError('unknown port type: {}'.format(port_type))
 
     return cls._create_from_ptr_and_get_ref(ptr)
 
@@ -41,7 +40,7 @@ def _create_self_from_ptr_and_get_ref(ptr, port_type):
     cls = _PORT_TYPE_TO_USER_PYCLS.get(port_type, None)
 
     if cls is None:
-        raise bt2.Error('unknown port type: {}'.format(port_type))
+        raise TypeError('unknown port type: {}'.format(port_type))
 
     return cls._create_from_ptr_and_get_ref(ptr)
 
@@ -72,7 +71,7 @@ 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._Connection._create_from_ptr_and_get_ref(conn_ptr)
 
     @property
     def is_connected(self):
@@ -101,7 +100,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._Connection._create_from_ptr_and_get_ref(conn_ptr)
 
     @property
     def user_data(self):
@@ -110,18 +109,15 @@ class _UserComponentPort(_Port):
 
 
 class _UserComponentInputPort(_UserComponentPort, _InputPort):
-    _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)
+    _as_self_port_ptr = staticmethod(
+        native_bt.self_component_port_input_as_self_component_port
+    )
 
 
 class _UserComponentOutputPort(_UserComponentPort, _OutputPort):
-    _as_self_port_ptr = staticmethod(native_bt.self_component_port_output_as_self_component_port)
+    _as_self_port_ptr = staticmethod(
+        native_bt.self_component_port_output_as_self_component_port
+    )
 
 
 _PORT_TYPE_TO_PYCLS = {