X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fstream.py;h=264d5477f45fc948253db6abb702f3d071003c18;hb=5783664e46332216fd38a7b287258a7c9543af57;hp=eb780b0ee6ab02c9d0c78ff6502f0037a9593597;hpb=26fc5aedf48df3f1654fe4d0b6ada1a10cd804f2;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/stream.py b/src/bindings/python/bt2/bt2/stream.py
index eb780b0e..264d5477 100644
--- a/src/bindings/python/bt2/bt2/stream.py
+++ b/src/bindings/python/bt2/bt2/stream.py
@@ -21,12 +21,15 @@
 # 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
+from bt2 import value as bt2_value
 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 +37,9 @@ 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(stream_class_ptr)
+        return bt2_stream_class._StreamClass._create_from_ptr_and_get_ref(
+            stream_class_ptr
+        )
 
     @property
     def name(self):
@@ -46,6 +51,19 @@ class _Stream(bt2.object._SharedObject):
 
     _name = property(fset=_name)
 
+    @property
+    def user_attributes(self):
+        ptr = native_bt.stream_borrow_user_attributes(self._ptr)
+        assert ptr is not None
+        return bt2_value._create_from_ptr_and_get_ref(ptr)
+
+    def _user_attributes(self, user_attributes):
+        value = bt2_value.create_value(user_attributes)
+        utils._check_type(value, bt2_value.MapValue)
+        native_bt.stream_set_user_attributes(self._ptr, value._ptr)
+
+    _user_attributes = property(fset=_user_attributes)
+
     @property
     def id(self):
         id = native_bt.stream_get_id(self._ptr)
@@ -53,11 +71,19 @@ class _Stream(bt2.object._SharedObject):
 
     def create_packet(self):
         if not self.cls.supports_packets:
-            raise bt2.Error('cannot create packet: stream class does not support packets')
+            raise ValueError(
+                'cannot create packet: stream class does not support packets'
+            )
 
         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)