bt2: make it work for Python 3.4

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

diff --git a/src/bindings/python/bt2/bt2/packet.py b/src/bindings/python/bt2/bt2/packet.py
index 93e9ac8f79419d10d21af7d1a707e5dbad7a348e..9dfff9eb54d6ba8358ac5f9033f816e55e18daf5 100644 (file)
--- a/src/bindings/python/bt2/bt2/packet.py
+++ b/src/bindings/python/bt2/bt2/packet.py
@@ -21,27 +21,45 @@
 # THE SOFTWARE.
 
 from bt2 import native_bt, object
-import bt2.field
-import bt2
+from bt2 import field as bt2_field
 
 
-class _Packet(object._SharedObject):
+def _bt2_stream():
+    from bt2 import stream as bt2_stream
+
+    return bt2_stream
+
+
+class _PacketConst(object._SharedObject):
     _get_ref = staticmethod(native_bt.packet_get_ref)
     _put_ref = staticmethod(native_bt.packet_put_ref)
+    _borrow_stream_ptr = staticmethod(native_bt.packet_borrow_stream_const)
+    _borrow_context_field_ptr = staticmethod(
+        native_bt.packet_borrow_context_field_const
+    )
+    _stream_pycls = property(lambda _: _bt2_stream()._StreamConst)
+    _create_field_from_ptr = staticmethod(bt2_field._create_field_from_const_ptr)
 
     @property
     def stream(self):
-        stream_ptr = native_bt.packet_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 context_field(self):
-        field_ptr = native_bt.packet_borrow_context_field(self._ptr)
+        field_ptr = self._borrow_context_field_ptr(self._ptr)
 
         if field_ptr is None:
             return
 
-        return bt2.field._create_field_from_ptr(field_ptr, self._ptr,
-                                                self._get_ref,
-                                                self._put_ref)
+        return self._create_field_from_ptr(
+            field_ptr, self._ptr, self._get_ref, self._put_ref
+        )
+
+
+class _Packet(_PacketConst):
+    _borrow_stream_ptr = staticmethod(native_bt.packet_borrow_stream)
+    _borrow_context_field_ptr = staticmethod(native_bt.packet_borrow_context_field)
+    _stream_pycls = property(lambda _: _bt2_stream()._Stream)
+    _create_field_from_ptr = staticmethod(bt2_field._create_field_from_ptr)