X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fpacket.py;h=9325a7d6fc29cbb0168c9651761d72f1fa2d0642;hb=768f9bcbf4b5acd09dda85ab32c0ea30d8826136;hp=266f7bcbb7c0f84566ace21334e9f9e5fa8e162a;hpb=cfbd7cf3bde05e8a6606478889dcd663604ef7b5;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/packet.py b/src/bindings/python/bt2/bt2/packet.py
index 266f7bcb..9325a7d6 100644
--- a/src/bindings/python/bt2/bt2/packet.py
+++ b/src/bindings/python/bt2/bt2/packet.py
@@ -1,47 +1,47 @@
-# The MIT License (MIT)
+# SPDX-License-Identifier: MIT
 #
 # Copyright (c) 2016-2017 Philippe Proulx <pproulx@efficios.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
 
 from bt2 import native_bt, object
-import bt2.field
-import bt2
+from bt2 import field as bt2_field
+
 
+def _bt2_stream():
+    from bt2 import stream as bt2_stream
 
-class _Packet(object._SharedObject):
+    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(
+        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)