bt2: Add remaining trace-ir `*Const` classes and adapt tests

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

diff --git a/src/bindings/python/bt2/bt2/message_iterator.py b/src/bindings/python/bt2/bt2/message_iterator.py
index 23e2c9a6a0c0257eeead66b184c610e768bf8d2b..d28beb25a30c6cb9d3f710c8d7d8b77d47e10ff2 100644 (file)
--- a/src/bindings/python/bt2/bt2/message_iterator.py
+++ b/src/bindings/python/bt2/bt2/message_iterator.py
@@ -23,7 +23,6 @@
 from bt2 import native_bt, object, utils
 from bt2 import message as bt2_message
 import collections.abc
-from bt2 import component as bt2_component
 from bt2 import stream as bt2_stream
 from bt2 import event_class as bt2_event_class
 from bt2 import packet as bt2_packet
@@ -63,7 +62,7 @@ class _GenericMessageIterator(object._SharedObject, _MessageIterator):
         return res != 0
 
     def seek_beginning(self):
-        # Forget about buffered messages, they won't be valid after seeking..
+        # Forget about buffered messages, they won't be valid after seeking.
         self._current_msgs.clear()
         self._at = 0
 
@@ -144,10 +143,10 @@ class _UserMessageIterator(_MessageIterator):
             msg = next(self)
         except StopIteration:
             raise bt2.Stop
-        except:
+        except Exception:
             raise
 
-        utils._check_type(msg, bt2_message._Message)
+        utils._check_type(msg, bt2_message._MessageConst)
 
         # The reference we return will be given to the message array.
         # However, the `msg` Python object may stay alive, if the user has kept
@@ -161,7 +160,7 @@ class _UserMessageIterator(_MessageIterator):
         #
         # - If the iterator has a _user_can_seek_beginning attribute,
         #   read it and use that result.
-        # - Otherwise, the presence or absence of a `_seek_beginning`
+        # - Otherwise, the presence or absence of a `_user_seek_beginning`
         #   method indicates whether the iterator can seek beginning.
         if hasattr(self, '_user_can_seek_beginning'):
             can_seek_beginning = self._user_can_seek_beginning
@@ -176,18 +175,15 @@ class _UserMessageIterator(_MessageIterator):
     def _create_input_port_message_iterator(self, input_port):
         utils._check_type(input_port, bt2_port._UserComponentInputPort)
 
-        msg_iter_ptr = native_bt.self_component_port_input_message_iterator_create_from_message_iterator(
+        status, msg_iter_ptr = native_bt.bt2_self_component_port_input_message_iterator_create_from_message_iterator(
             self._bt_ptr, input_port._ptr
         )
-
-        if msg_iter_ptr is None:
-            raise bt2._MemoryError('cannot create message iterator object')
+        utils._handle_func_status(status, 'cannot create message iterator object')
+        assert msg_iter_ptr is not None
 
         return _UserComponentInputPortMessageIterator(msg_iter_ptr)
 
-    def _create_event_message(
-        self, event_class, parent=None, default_clock_snapshot=None
-    ):
+    def _create_event_message(self, event_class, parent, default_clock_snapshot=None):
         utils._check_type(event_class, bt2_event_class._EventClass)
 
         if event_class.stream_class.supports_packets: