Update Python bindings and tests to match the latest API

[babeltrace.git] / bindings / python / bt2 / stream.py

diff --git a/bindings/python/bt2/stream.py b/bindings/python/bt2/stream.py
index 56bd5100e397b0ab9b49f25d81e4cec20615eaa6..32fb9a5fb0de8c44e9daa5e1d8e05593d72f48a8 100644 (file)
--- a/bindings/python/bt2/stream.py
+++ b/bindings/python/bt2/stream.py
@@ -42,18 +42,23 @@ class _StreamBase(object._Object):
     @property
     def stream_class(self):
         stream_class_ptr = native_bt.ctf_stream_get_class(self._ptr)
-        utils._handle_ptr(stream_class_ptr, "cannot get stream object's stream class object")
+        assert(stream_class_ptr)
         return bt2.StreamClass._create_from_ptr(stream_class_ptr)
 
     @property
     def name(self):
         return native_bt.ctf_stream_get_name(self._ptr)
 
+    @property
+    def id(self):
+        id = native_bt.ctf_stream_get_id(self._ptr)
+        return id if id >= 0 else None
+
     def __eq__(self, other):
         if self.addr == other.addr:
             return True
 
-        return self.name == other.name
+        return (self.name, self.id) == (other.name, other.id)
 
 
 class _Stream(_StreamBase):
@@ -72,7 +77,7 @@ class _Stream(_StreamBase):
         return _StreamBase.__eq__(self, other)
 
     def _copy(self):
-        return self.stream_class(self.name)
+        return self.stream_class(self.name, self.id)
 
     def __copy__(self):
         return self._copy()