X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fevent.py;h=6a6c1185987517c8c930e32b0b545e19b0daf5a8;hb=5e6ea7a66704b78180520cb8f1fccaed5d9ea7b1;hp=78179c5a91826285ef67ce48aebf3a69ce69ba14;hpb=d016011deb0073f3962ca60cc8319117b5d1a446;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/event.py b/src/bindings/python/bt2/bt2/event.py
index 78179c5a..6a6c1185 100644
--- a/src/bindings/python/bt2/bt2/event.py
+++ b/src/bindings/python/bt2/bt2/event.py
@@ -21,21 +21,34 @@
 # 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 _EventConst(object._UniqueObject):
+    _borrow_class_ptr = staticmethod(native_bt.event_borrow_class_const)
+    _borrow_packet_ptr = staticmethod(native_bt.event_borrow_packet_const)
+    _borrow_stream_ptr = staticmethod(native_bt.event_borrow_stream_const)
+    _borrow_common_context_field_ptr = staticmethod(
+        native_bt.event_borrow_common_context_field_const
+    )
+    _borrow_specific_context_field_ptr = staticmethod(
+        native_bt.event_borrow_specific_context_field_const
+    )
+    _borrow_payload_field_ptr = staticmethod(native_bt.event_borrow_payload_field_const)
+    _create_field_from_ptr = staticmethod(bt2_field._create_field_from_const_ptr)
+
+    _event_class_pycls = property(lambda _: bt2_event_class._EventClassConst)
+    _packet_pycls = property(lambda _: bt2_packet._PacketConst)
+    _stream_pycls = property(lambda _: bt2_stream._StreamConst)
 
-
-class _Event(object._UniqueObject):
     @property
     def cls(self):
-        event_class_ptr = native_bt.event_borrow_class(self._ptr)
+        event_class_ptr = self._borrow_class_ptr(self._ptr)
         assert event_class_ptr is not None
-        return bt2.event_class._EventClass._create_from_ptr_and_get_ref(event_class_ptr)
+        return self._event_class_pycls._create_from_ptr_and_get_ref(event_class_ptr)
 
     @property
     def name(self):
@@ -47,49 +60,49 @@ class _Event(object._UniqueObject):
 
     @property
     def packet(self):
-        packet_ptr = native_bt.event_borrow_packet(self._ptr)
+        packet_ptr = self._borrow_packet_ptr(self._ptr)
 
         if packet_ptr is None:
             return
 
-        return bt2.packet._Packet._create_from_ptr_and_get_ref(packet_ptr)
+        return self._packet_pycls._create_from_ptr_and_get_ref(packet_ptr)
 
     @property
     def stream(self):
-        stream_ptr = native_bt.event_borrow_stream(self._ptr)
+        stream_ptr = self._borrow_stream_ptr(self._ptr)
         assert stream_ptr is not None
-        return bt2.stream._Stream._create_from_ptr_and_get_ref(stream_ptr)
+        return self._stream_pycls._create_from_ptr_and_get_ref(stream_ptr)
 
     @property
     def common_context_field(self):
-        field_ptr = native_bt.event_borrow_common_context_field(self._ptr)
+        field_ptr = self._borrow_common_context_field_ptr(self._ptr)
 
         if field_ptr is None:
             return
 
-        return bt2.field._create_field_from_ptr(
+        return self._create_field_from_ptr(
             field_ptr, self._owner_ptr, self._owner_get_ref, self._owner_put_ref
         )
 
     @property
     def specific_context_field(self):
-        field_ptr = native_bt.event_borrow_specific_context_field(self._ptr)
+        field_ptr = self._borrow_specific_context_field_ptr(self._ptr)
 
         if field_ptr is None:
             return
 
-        return bt2.field._create_field_from_ptr(
+        return self._create_field_from_ptr(
             field_ptr, self._owner_ptr, self._owner_get_ref, self._owner_put_ref
         )
 
     @property
     def payload_field(self):
-        field_ptr = native_bt.event_borrow_payload_field(self._ptr)
+        field_ptr = self._borrow_payload_field_ptr(self._ptr)
 
         if field_ptr is None:
             return
 
-        return bt2.field._create_field_from_ptr(
+        return self._create_field_from_ptr(
             field_ptr, self._owner_ptr, self._owner_get_ref, self._owner_put_ref
         )
 
@@ -110,9 +123,28 @@ class _Event(object._UniqueObject):
         if common_context_field is not None and key in common_context_field:
             return common_context_field[key]
 
-        packet_context_field = self.packet.context_field
+        if self.packet:
+            packet_context_field = self.packet.context_field
 
-        if packet_context_field is not None and key in packet_context_field:
-            return packet_context_field[key]
+            if packet_context_field is not None and key in packet_context_field:
+                return packet_context_field[key]
 
         raise KeyError(key)
+
+
+class _Event(_EventConst):
+    _borrow_class_ptr = staticmethod(native_bt.event_borrow_class)
+    _borrow_packet_ptr = staticmethod(native_bt.event_borrow_packet)
+    _borrow_stream_ptr = staticmethod(native_bt.event_borrow_stream)
+    _borrow_common_context_field_ptr = staticmethod(
+        native_bt.event_borrow_common_context_field
+    )
+    _borrow_specific_context_field_ptr = staticmethod(
+        native_bt.event_borrow_specific_context_field
+    )
+    _borrow_payload_field_ptr = staticmethod(native_bt.event_borrow_payload_field)
+    _create_field_from_ptr = staticmethod(bt2_field._create_field_from_ptr)
+
+    _event_class_pycls = property(lambda _: bt2_event_class._EventClass)
+    _packet_pycls = property(lambda _: bt2_packet._Packet)
+    _stream_pycls = property(lambda _: bt2_stream._Stream)