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

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

diff --git a/src/bindings/python/bt2/bt2/event.py b/src/bindings/python/bt2/bt2/event.py
index 4ff398b7565d291154c82c58b4d06ff71a1c0732..afa54947f983cb78e6a74701578ed4627a33e565 100644 (file)
--- a/src/bindings/python/bt2/bt2/event.py
+++ b/src/bindings/python/bt2/bt2/event.py
@@ -21,13 +21,10 @@
 # THE SOFTWARE.
 
 from bt2 import native_bt, object, utils
-import bt2.clock_class
-import bt2.event_class
-import bt2.packet
-import bt2.stream
-import bt2.field
-import bt2.clock_snapshot
-import bt2
+from bt2 import event_class as bt2_event_class
+from bt2 import packet as bt2_packet
+from bt2 import stream as bt2_stream
+from bt2 import field as bt2_field
 
 
 class _Event(object._UniqueObject):
@@ -35,7 +32,7 @@ class _Event(object._UniqueObject):
     def cls(self):
         event_class_ptr = native_bt.event_borrow_class(self._ptr)
         assert event_class_ptr is not None
-        return bt2.event_class._EventClass._create_from_ptr_and_get_ref(event_class_ptr)
+        return bt2_event_class._EventClass._create_from_ptr_and_get_ref(event_class_ptr)
 
     @property
     def name(self):
@@ -48,14 +45,17 @@ class _Event(object._UniqueObject):
     @property
     def packet(self):
         packet_ptr = native_bt.event_borrow_packet(self._ptr)
-        assert packet_ptr is not None
-        return bt2.packet._Packet._create_from_ptr_and_get_ref(packet_ptr)
+
+        if packet_ptr is None:
+            return
+
+        return bt2_packet._Packet._create_from_ptr_and_get_ref(packet_ptr)
 
     @property
     def stream(self):
         stream_ptr = native_bt.event_borrow_stream(self._ptr)
         assert stream_ptr is not None
-        return bt2._Stream._create_from_ptr_and_get_ref(stream_ptr)
+        return bt2_stream._Stream._create_from_ptr_and_get_ref(stream_ptr)
 
     @property
     def common_context_field(self):
@@ -64,9 +64,9 @@ class _Event(object._UniqueObject):
         if field_ptr is None:
             return
 
-        return bt2.field._create_field_from_ptr(field_ptr, self._owner_ptr,
-                                                self._owner_get_ref,
-                                                self._owner_put_ref)
+        return bt2_field._create_field_from_ptr(
+            field_ptr, self._owner_ptr, self._owner_get_ref, self._owner_put_ref
+        )
 
     @property
     def specific_context_field(self):
@@ -75,9 +75,9 @@ class _Event(object._UniqueObject):
         if field_ptr is None:
             return
 
-        return bt2.field._create_field_from_ptr(field_ptr, self._owner_ptr,
-                                                self._owner_get_ref,
-                                                self._owner_put_ref)
+        return bt2_field._create_field_from_ptr(
+            field_ptr, self._owner_ptr, self._owner_get_ref, self._owner_put_ref
+        )
 
     @property
     def payload_field(self):
@@ -86,9 +86,9 @@ class _Event(object._UniqueObject):
         if field_ptr is None:
             return
 
-        return bt2.field._create_field_from_ptr(field_ptr, self._owner_ptr,
-                                                self._owner_get_ref,
-                                                self._owner_put_ref)
+        return bt2_field._create_field_from_ptr(
+            field_ptr, self._owner_ptr, self._owner_get_ref, self._owner_put_ref
+        )
 
     def __getitem__(self, key):
         utils._check_str(key)