X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Ftrace.py;h=e893b2d28bfabb24906b8735857b822b0bc728a0;hb=57081273d1191fc79edc101af619fab96b72460d;hp=a90b53ce9433352d33bae6a7308f167b3088db12;hpb=694c792bc8f078c02acde68a3390acafbb36b2f4;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/trace.py b/src/bindings/python/bt2/bt2/trace.py
index a90b53ce..e893b2d2 100644
--- 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):
@@ -76,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)
 
 
@@ -97,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)):
@@ -113,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):
@@ -145,7 +145,7 @@ 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:
@@ -168,7 +168,7 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
         if stream_ptr is None:
             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
@@ -190,4 +190,4 @@ class _Trace(object._SharedObject, collections.abc.Mapping):
             status, 'cannot add destruction listener to trace object'
         )
 
-        return bt2._ListenerHandle(listener_id, self)
+        return utils._ListenerHandle(listener_id, self)