X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fstream.py;h=4710aeaaa0cb51e215279694d25588f3d3491c82;hb=57081273d1191fc79edc101af619fab96b72460d;hp=70011758cefaa01b0b2e4bd44e610de676cae606;hpb=ce4923b0c7a2de36eba95725334d251e9aa08aad;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/stream.py b/src/bindings/python/bt2/bt2/stream.py index 70011758..4710aeaa 100644 --- a/src/bindings/python/bt2/bt2/stream.py +++ b/src/bindings/python/bt2/bt2/stream.py @@ -21,12 +21,14 @@ # THE SOFTWARE. from bt2 import native_bt, utils -import bt2.packet -import bt2.event +from bt2 import object as bt2_object +from bt2 import packet as bt2_packet +from bt2 import trace as bt2_trace +from bt2 import stream_class as bt2_stream_class import bt2 -class _Stream(bt2.object._SharedObject): +class _Stream(bt2_object._SharedObject): _get_ref = staticmethod(native_bt.stream_get_ref) _put_ref = staticmethod(native_bt.stream_put_ref) @@ -34,7 +36,7 @@ class _Stream(bt2.object._SharedObject): def cls(self): stream_class_ptr = native_bt.stream_borrow_class(self._ptr) assert stream_class_ptr is not None - return bt2.stream_class._StreamClass._create_from_ptr_and_get_ref( + return bt2_stream_class._StreamClass._create_from_ptr_and_get_ref( stream_class_ptr ) @@ -62,6 +64,12 @@ class _Stream(bt2.object._SharedObject): packet_ptr = native_bt.packet_create(self._ptr) if packet_ptr is None: - raise bt2.CreationError('cannot create packet object') + raise bt2._MemoryError('cannot create packet object') - return bt2.packet._Packet._create_from_ptr(packet_ptr) + return bt2_packet._Packet._create_from_ptr(packet_ptr) + + @property + def trace(self): + trace_ptr = native_bt.stream_borrow_trace(self._ptr) + assert trace_ptr is not None + return bt2_trace._Trace._create_from_ptr_and_get_ref(trace_ptr)