sink.text.details: print user attributes

[babeltrace.git] / src / bindings / python / bt2 / bt2 / trace.py

diff --git a/src/bindings/python/bt2/bt2/trace.py b/src/bindings/python/bt2/bt2/trace.py
index d7f03cb5d11e4f698d9c2bbe485ebd76c56ffaee..e893b2d28bfabb24906b8735857b822b0bc728a0 100644 (file)
--- a/src/bindings/python/bt2/bt2/trace.py
+++ b/src/bindings/python/bt2/bt2/trace.py
@@ -21,11 +21,11 @@
 # THE SOFTWARE.
 
 from bt2 import native_bt, object, utils
-import bt2.field_class
 import collections.abc
-import bt2.value
-import bt2.stream
-import bt2.trace_class
+from bt2 import value as bt2_value
+from bt2 import stream as bt2_stream
+from bt2 import trace_class as bt2_trace_class
+from bt2 import stream_class as bt2_stream_class
 import bt2
 import functools
 import uuid as uuidp
@@ -44,7 +44,7 @@ class _TraceEnv(collections.abc.MutableMapping):
         if value_ptr is None:
             raise KeyError(key)
 
-        return bt2.value._create_from_ptr_and_get_ref(value_ptr)
+        return bt2_value._create_from_ptr_and_get_ref(value_ptr)
 
     def __setitem__(self, key, value):
         if isinstance(value, str):
@@ -55,8 +55,7 @@ class _TraceEnv(collections.abc.MutableMapping):
             raise TypeError('expected str or int, got {}'.format(type(value)))
 
         status = set_env_entry_fn(self._trace._ptr, key, value)
-        utils._handle_func_status(status,
-                                  "cannot set trace object's environment entry")
+        utils._handle_func_status(status, "cannot set trace object's environment entry")
 
     def __delitem__(self, key):
         raise NotImplementedError
@@ -77,7 +76,7 @@ class _TraceEnv(collections.abc.MutableMapping):
 
 
 def _trace_destruction_listener_from_native(user_listener, trace_ptr):
-    trace = bt2.trace._Trace._create_from_ptr_and_get_ref(trace_ptr)
+    trace = _Trace._create_from_ptr_and_get_ref(trace_ptr)
     user_listener(trace)
 
 
@@ -98,7 +97,7 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
         if stream_ptr is None:
             raise KeyError(id)
 
-        return bt2.stream._Stream._create_from_ptr_and_get_ref(stream_ptr)
+        return bt2_stream._Stream._create_from_ptr_and_get_ref(stream_ptr)
 
     def __iter__(self):
         for idx in range(len(self)):
@@ -114,7 +113,7 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
     def cls(self):
         trace_class_ptr = native_bt.trace_borrow_class(self._ptr)
         assert trace_class_ptr is not None
-        return bt2.trace_class._TraceClass._create_from_ptr_and_get_ref(trace_class_ptr)
+        return bt2_trace_class._TraceClass._create_from_ptr_and_get_ref(trace_class_ptr)
 
     @property
     def name(self):
@@ -123,8 +122,7 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
     def _name(self, name):
         utils._check_str(name)
         status = native_bt.trace_set_name(self._ptr, name)
-        utils._handle_func_status(status,
-                                  "cannot set trace class object's name")
+        utils._handle_func_status(status, "cannot set trace class object's name")
 
     _name = property(fset=_name)
 
@@ -147,24 +145,30 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
         return _TraceEnv(self)
 
     def create_stream(self, stream_class, id=None, name=None):
-        utils._check_type(stream_class, bt2.stream_class._StreamClass)
+        utils._check_type(stream_class, bt2_stream_class._StreamClass)
 
         if stream_class.assigns_automatic_stream_id:
             if id is not None:
-                raise ValueError("id provided, but stream class assigns automatic stream ids")
+                raise ValueError(
+                    "id provided, but stream class assigns automatic stream ids"
+                )
 
             stream_ptr = native_bt.stream_create(stream_class._ptr, self._ptr)
         else:
             if id is None:
-                raise ValueError("id not provided, but stream class does not assign automatic stream ids")
+                raise ValueError(
+                    "id not provided, but stream class does not assign automatic stream ids"
+                )
 
             utils._check_uint64(id)
-            stream_ptr = native_bt.stream_create_with_id(stream_class._ptr, self._ptr, id)
+            stream_ptr = native_bt.stream_create_with_id(
+                stream_class._ptr, self._ptr, id
+            )
 
         if stream_ptr is None:
-            raise bt2.CreationError('cannot create stream object')
+            raise bt2._MemoryError('cannot create stream object')
 
-        stream = bt2.stream._Stream._create_from_ptr(stream_ptr)
+        stream = bt2_stream._Stream._create_from_ptr(stream_ptr)
 
         if name is not None:
             stream._name = name
@@ -177,11 +181,13 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
             raise TypeError("'listener' parameter is not callable")
 
         fn = native_bt.bt2_trace_add_destruction_listener
-        listener_from_native = functools.partial(_trace_destruction_listener_from_native,
-                                                 listener)
+        listener_from_native = functools.partial(
+            _trace_destruction_listener_from_native, listener
+        )
 
-        listener_id = fn(self._ptr, listener_from_native)
-        if listener_id is None:
-            utils._raise_bt2_error('cannot add destruction listener to trace object')
+        status, listener_id = fn(self._ptr, listener_from_native)
+        utils._handle_func_status(
+            status, 'cannot add destruction listener to trace object'
+        )
 
-        return bt2._ListenerHandle(listener_id, self)
+        return utils._ListenerHandle(listener_id, self)