bt2: Add `_Clock*Const` classes and adapt tests

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

diff --git a/src/bindings/python/bt2/bt2/message.py b/src/bindings/python/bt2/bt2/message.py
index aeb9ebd8d8a2c1b9f0b97ff9471d917daff0d7d7..6e3ab761513e054e8caa23f0ebd4e0cd48aad501 100644 (file)
--- a/src/bindings/python/bt2/bt2/message.py
+++ b/src/bindings/python/bt2/bt2/message.py
@@ -21,11 +21,10 @@
 # THE SOFTWARE.
 
 from bt2 import native_bt, object, utils
-import bt2.clock_snapshot
-import bt2.packet
-import bt2.stream
-import bt2.event
-import bt2
+from bt2 import clock_snapshot as bt2_clock_snapshot
+from bt2 import packet as bt2_packet
+from bt2 import stream as bt2_stream
+from bt2 import event as bt2_event
 
 
 def _create_from_ptr(ptr):
@@ -40,7 +39,7 @@ class _Message(object._SharedObject):
     @staticmethod
     def _check_has_default_clock_class(clock_class):
         if clock_class is None:
-            raise bt2.NonexistentClockSnapshot(
+            raise ValueError(
                 'cannot get default clock snapshot: stream class has no default clock class'
             )
 
@@ -49,7 +48,7 @@ class _MessageWithDefaultClockSnapshot:
     def _get_default_clock_snapshot(self, borrow_clock_snapshot_ptr):
         snapshot_ptr = borrow_clock_snapshot_ptr(self._ptr)
 
-        return bt2.clock_snapshot._ClockSnapshot._create_from_ptr_and_get_ref(
+        return bt2_clock_snapshot._ClockSnapshotConst._create_from_ptr_and_get_ref(
             snapshot_ptr, self._ptr, self._get_ref, self._put_ref
         )
 
@@ -68,7 +67,7 @@ class _EventMessage(_Message, _MessageWithDefaultClockSnapshot):
     def event(self):
         event_ptr = native_bt.message_event_borrow_event(self._ptr)
         assert event_ptr is not None
-        return bt2.event._Event._create_from_ptr_and_get_ref(
+        return bt2_event._Event._create_from_ptr_and_get_ref(
             event_ptr, self._ptr, self._get_ref, self._put_ref
         )
 
@@ -83,7 +82,7 @@ class _PacketMessage(_Message, _MessageWithDefaultClockSnapshot):
     def packet(self):
         packet_ptr = self._borrow_packet_ptr(self._ptr)
         assert packet_ptr is not None
-        return bt2.packet._Packet._create_from_ptr_and_get_ref(packet_ptr)
+        return bt2_packet._Packet._create_from_ptr_and_get_ref(packet_ptr)
 
 
 class _PacketBeginningMessage(_PacketMessage):
@@ -105,7 +104,7 @@ class _StreamMessage(_Message, _MessageWithDefaultClockSnapshot):
     def stream(self):
         stream_ptr = self._borrow_stream_ptr(self._ptr)
         assert stream_ptr
-        return bt2.stream._Stream._create_from_ptr_and_get_ref(stream_ptr)
+        return bt2_stream._Stream._create_from_ptr_and_get_ref(stream_ptr)
 
     @property
     def default_clock_snapshot(self):
@@ -114,9 +113,9 @@ class _StreamMessage(_Message, _MessageWithDefaultClockSnapshot):
         status, snapshot_ptr = self._borrow_default_clock_snapshot_ptr(self._ptr)
 
         if status == native_bt.MESSAGE_STREAM_CLOCK_SNAPSHOT_STATE_UNKNOWN:
-            return bt2.clock_snapshot._UnknownClockSnapshot()
+            return bt2_clock_snapshot._UnknownClockSnapshot()
 
-        return bt2.clock_snapshot._ClockSnapshot._create_from_ptr_and_get_ref(
+        return bt2_clock_snapshot._ClockSnapshotConst._create_from_ptr_and_get_ref(
             snapshot_ptr, self._ptr, self._get_ref, self._put_ref
         )
 
@@ -164,7 +163,7 @@ class _DiscardedMessage(_Message, _MessageWithDefaultClockSnapshot):
     def stream(self):
         stream_ptr = self._borrow_stream_ptr(self._ptr)
         assert stream_ptr
-        return bt2.stream._Stream._create_from_ptr_and_get_ref(stream_ptr)
+        return bt2_stream._Stream._create_from_ptr_and_get_ref(stream_ptr)
 
     @property
     def count(self):
@@ -180,7 +179,7 @@ class _DiscardedMessage(_Message, _MessageWithDefaultClockSnapshot):
 
     def _check_has_default_clock_snapshots(self):
         if not self._has_default_clock_snapshots:
-            raise bt2.NonexistentClockSnapshot(
+            raise ValueError(
                 'cannot get default clock snapshot: such a message has no clock snapshots for this stream class'
             )