X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fpacket.py;h=097614fe444900865d19cff39a13cdbc176cb282;hb=9dee90bdad3dac00a1caff5c9a1e58fb284ee19d;hp=bb629bbd5ab5248b216c67ba7724fabc1d593793;hpb=3fb99a226ccb40c79de6b55b5a249d93b9c5262e;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/packet.py b/src/bindings/python/bt2/bt2/packet.py
index bb629bbd..097614fe 100644
--- a/src/bindings/python/bt2/bt2/packet.py
+++ b/src/bindings/python/bt2/bt2/packet.py
@@ -1,48 +1,53 @@
-# 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
 from bt2 import field as bt2_field
-from bt2 import stream as bt2_stream
-import bt2
 
 
-class _Packet(object._SharedObject):
-    _get_ref = staticmethod(native_bt.packet_get_ref)
-    _put_ref = staticmethod(native_bt.packet_put_ref)
+def _bt2_stream():
+    from bt2 import stream as bt2_stream
+
+    return bt2_stream
+
+
+class _PacketConst(object._SharedObject):
+    @staticmethod
+    def _get_ref(ptr):
+        native_bt.packet_get_ref(ptr)
+
+    @staticmethod
+    def _put_ref(ptr):
+        native_bt.packet_put_ref(ptr)
+
+    _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)