From c345b07873b0cb0ed344bde32a322a1b1edf60ae Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 28 Aug 2023 17:01:58 -0400 Subject: [PATCH] python: remove internal `import bt2` imports Standardize the internal imports to import specific modules like this: from bt2 import foo as bt2_foo ... instead of importing the complete bt2 package. Change-Id: I32eb223a8bcfe841020a2aafb976f121dadd8680 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/10388 Tested-by: jenkins Reviewed-by: Philippe Proulx --- src/bindings/python/bt2/bt2/component.py | 31 +++++----- .../python/bt2/bt2/component_descriptor.py | 4 +- src/bindings/python/bt2/bt2/field_class.py | 10 ++-- src/bindings/python/bt2/bt2/graph.py | 14 +++-- .../python/bt2/bt2/integer_range_set.py | 4 +- src/bindings/python/bt2/bt2/interrupter.py | 4 +- .../python/bt2/bt2/message_iterator.py | 26 +++++---- src/bindings/python/bt2/bt2/mip.py | 10 ++-- src/bindings/python/bt2/bt2/query_executor.py | 6 +- src/bindings/python/bt2/bt2/stream.py | 4 +- src/bindings/python/bt2/bt2/trace.py | 5 +- src/bindings/python/bt2/bt2/trace_class.py | 8 ++- .../bt2/trace_collection_message_iterator.py | 57 +++++++++++-------- src/bindings/python/bt2/bt2/utils.py | 22 +++---- src/bindings/python/bt2/bt2/value.py | 4 +- 15 files changed, 115 insertions(+), 94 deletions(-) diff --git a/src/bindings/python/bt2/bt2/component.py b/src/bindings/python/bt2/bt2/component.py index 9deb5721..7357eb7e 100644 --- a/src/bindings/python/bt2/bt2/component.py +++ b/src/bindings/python/bt2/bt2/component.py @@ -12,8 +12,9 @@ from bt2 import trace_class as bt2_trace_class from bt2 import clock_class as bt2_clock_class from bt2 import query_executor as bt2_query_executor from bt2 import port as bt2_port +from bt2 import error as bt2_error +from bt2 import integer_range_set as bt2_integer_range_set import sys -import bt2 class _IncompleteUserClass(Exception): @@ -515,7 +516,7 @@ class _UserComponentType(type): ) elif _UserSinkComponent in bases: if not hasattr(cls, "_user_consume"): - raise bt2._IncompleteUserClass( + raise _IncompleteUserClass( "cannot create component class '{}': missing a _user_consume() method".format( class_name ) @@ -525,14 +526,14 @@ class _UserComponentType(type): cls, comp_cls_name, comp_cls_descr, comp_cls_help ) else: - raise bt2._IncompleteUserClass( + raise _IncompleteUserClass( "cannot find a known component class base in the bases of '{}'".format( class_name ) ) if cc_ptr is None: - raise bt2._MemoryError( + raise bt2_error._MemoryError( "cannot create component class '{}'".format(class_name) ) @@ -565,21 +566,21 @@ class _UserComponentType(type): @staticmethod def _bt_set_iterator_class(cls, iter_cls): if iter_cls is None: - raise bt2._IncompleteUserClass( + raise _IncompleteUserClass( "cannot create component class '{}': missing message iterator class".format( cls.__name__ ) ) if not issubclass(iter_cls, bt2_message_iterator._UserMessageIterator): - raise bt2._IncompleteUserClass( + raise _IncompleteUserClass( "cannot create component class '{}': message iterator class does not inherit bt2._UserMessageIterator".format( cls.__name__ ) ) if not hasattr(iter_cls, "__next__"): - raise bt2._IncompleteUserClass( + raise _IncompleteUserClass( "cannot create component class '{}': message iterator class is missing a __next__() method".format( cls.__name__ ) @@ -588,7 +589,7 @@ class _UserComponentType(type): if hasattr(iter_cls, "_user_can_seek_ns_from_origin") and not hasattr( iter_cls, "_user_seek_ns_from_origin" ): - raise bt2._IncompleteUserClass( + raise _IncompleteUserClass( "cannot create component class '{}': message iterator class implements _user_can_seek_ns_from_origin but not _user_seek_ns_from_origin".format( cls.__name__ ) @@ -597,7 +598,7 @@ class _UserComponentType(type): if hasattr(iter_cls, "_user_can_seek_beginning") and not hasattr( iter_cls, "_user_seek_beginning" ): - raise bt2._IncompleteUserClass( + raise _IncompleteUserClass( "cannot create component class '{}': message iterator class implements _user_can_seek_beginning but not _user_seek_beginning".format( cls.__name__ ) @@ -634,9 +635,9 @@ class _UserComponentType(type): # this can raise, but the native side checks the exception range_set = cls._user_get_supported_mip_versions(params, obj, log_level) - if type(range_set) is not bt2.UnsignedIntegerRangeSet: + if type(range_set) is not bt2_integer_range_set.UnsignedIntegerRangeSet: # this can raise, but the native side checks the exception - range_set = bt2.UnsignedIntegerRangeSet(range_set) + range_set = bt2_integer_range_set.UnsignedIntegerRangeSet(range_set) # return new reference range_set._get_ref(range_set._ptr) @@ -669,7 +670,7 @@ class _UserComponentType(type): priv_query_exec._invalidate() # this can raise, but the native side checks the exception - results = bt2.create_value(results) + results = bt2_value.create_value(results) if results is None: results_ptr = native_bt.value_null @@ -681,7 +682,7 @@ class _UserComponentType(type): return int(results_ptr) def _user_query(cls, priv_query_executor, object_name, params, method_obj): - raise bt2.UnknownObject + raise bt2_utils.UnknownObject def _bt_component_class_ptr(self): return self._bt_as_component_class_ptr(self._bt_cc_ptr) @@ -791,7 +792,7 @@ class _UserComponent(metaclass=_UserComponentType): tc_ptr = native_bt.trace_class_create(ptr) if tc_ptr is None: - raise bt2._MemoryError("could not create trace class") + raise bt2_error._MemoryError("could not create trace class") tc = bt2_trace_class._TraceClass._create_from_ptr(tc_ptr) tc._assigns_automatic_stream_class_id = assigns_automatic_stream_class_id @@ -816,7 +817,7 @@ class _UserComponent(metaclass=_UserComponentType): cc_ptr = native_bt.clock_class_create(ptr) if cc_ptr is None: - raise bt2._MemoryError("could not create clock class") + raise bt2_error._MemoryError("could not create clock class") cc = bt2_clock_class._ClockClass._create_from_ptr(cc_ptr) diff --git a/src/bindings/python/bt2/bt2/component_descriptor.py b/src/bindings/python/bt2/bt2/component_descriptor.py index c09c98ef..4decafec 100644 --- a/src/bindings/python/bt2/bt2/component_descriptor.py +++ b/src/bindings/python/bt2/bt2/component_descriptor.py @@ -4,7 +4,7 @@ from bt2 import native_bt from bt2 import component as bt2_component -import bt2 +from bt2 import value as bt2_value def _is_source_comp_cls(comp_cls): @@ -56,7 +56,7 @@ class ComponentDescriptor: raise ValueError("cannot pass a Python object to a non-Python component") self._comp_cls = component_class - self._params = bt2.create_value(params) + self._params = bt2_value.create_value(params) self._obj = obj @property diff --git a/src/bindings/python/bt2/bt2/field_class.py b/src/bindings/python/bt2/bt2/field_class.py index 3f81c47c..ed2c44f5 100644 --- a/src/bindings/python/bt2/bt2/field_class.py +++ b/src/bindings/python/bt2/bt2/field_class.py @@ -8,8 +8,8 @@ from bt2 import utils as bt2_utils import collections.abc from bt2 import field_path as bt2_field_path from bt2 import integer_range_set as bt2_integer_range_set +from bt2 import error as bt2_error from bt2 import value as bt2_value -import bt2 def _obj_type_from_field_class_ptr_template(type_map, ptr): @@ -64,7 +64,7 @@ class _FieldClassConst(bt2_object._SharedObject): def _check_create_status(self, ptr): if ptr is None: - raise bt2._MemoryError( + raise bt2_error._MemoryError( "cannot create {} field class object".format(self._NAME.lower()) ) @@ -478,7 +478,7 @@ class _StructureFieldClass(_StructureFieldClassConst, _FieldClass): if user_attributes is not None: # check now that user attributes are valid - user_attributes_value = bt2.create_value(user_attributes) + user_attributes_value = bt2_value.create_value(user_attributes) status = native_bt.field_class_structure_append_member( self._ptr, name, field_class._ptr @@ -819,7 +819,7 @@ class _VariantFieldClassWithoutSelector( if user_attributes is not None: # check now that user attributes are valid - user_attributes_value = bt2.create_value(user_attributes) + user_attributes_value = bt2_value.create_value(user_attributes) status = native_bt.field_class_variant_without_selector_append_option( self._ptr, name, field_class._ptr @@ -873,7 +873,7 @@ class _VariantFieldClassWithIntegerSelector( if user_attributes is not None: # check now that user attributes are valid - user_attributes_value = bt2.create_value(user_attributes) + user_attributes_value = bt2_value.create_value(user_attributes) # TODO: check overlaps (precondition of self._append_option()) diff --git a/src/bindings/python/bt2/bt2/graph.py b/src/bindings/python/bt2/bt2/graph.py index dc81e281..9ec3cc1f 100644 --- a/src/bindings/python/bt2/bt2/graph.py +++ b/src/bindings/python/bt2/bt2/graph.py @@ -11,7 +11,9 @@ from bt2 import component as bt2_component import functools from bt2 import port as bt2_port from bt2 import logging as bt2_logging -import bt2 +from bt2 import mip as bt2_mip +from bt2 import error as bt2_error +from bt2 import value as bt2_value def _graph_port_added_listener_from_native( @@ -36,13 +38,13 @@ class Graph(bt2_object._SharedObject): def __init__(self, mip_version=0): bt2_utils._check_uint64(mip_version) - if mip_version > bt2.get_maximal_mip_version(): + if mip_version > bt2_mip.get_maximal_mip_version(): raise ValueError("unknown MIP version {}".format(mip_version)) ptr = native_bt.graph_create(mip_version) if ptr is None: - raise bt2._MemoryError("cannot create graph object") + raise bt2_error._MemoryError("cannot create graph object") super().__init__(ptr) @@ -96,10 +98,10 @@ class Graph(bt2_object._SharedObject): if obj is not None and not native_bt.bt2_is_python_component_class(base_cc_ptr): raise ValueError("cannot pass a Python object to a non-Python component") - if params is not None and not isinstance(params, (dict, bt2.MapValue)): + if params is not None and not isinstance(params, (dict, bt2_value.MapValue)): raise TypeError("'params' parameter is not a 'dict' or a 'bt2.MapValue'.") - params = bt2.create_value(params) + params = bt2_value.create_value(params) params_ptr = params._ptr if params is not None else None @@ -135,7 +137,7 @@ class Graph(bt2_object._SharedObject): listener_ids = fn(self._ptr, listener_from_native) if listener_ids is None: - raise bt2._Error("cannot add listener to graph object") + raise bt2_error._Error("cannot add listener to graph object") # keep the partial's reference self._listener_partials.append(listener_from_native) diff --git a/src/bindings/python/bt2/bt2/integer_range_set.py b/src/bindings/python/bt2/bt2/integer_range_set.py index 7195e438..7857f8b8 100644 --- a/src/bindings/python/bt2/bt2/integer_range_set.py +++ b/src/bindings/python/bt2/bt2/integer_range_set.py @@ -5,8 +5,8 @@ from bt2 import native_bt from bt2 import object as bt2_object from bt2 import utils as bt2_utils +from bt2 import error as bt2_error import collections.abc -import bt2 class _IntegerRangeConst: @@ -111,7 +111,7 @@ class _IntegerRangeSet(_IntegerRangeSetConst, collections.abc.MutableSet): ptr = self._create_range_set() if ptr is None: - raise bt2._MemoryError("cannot create range set object") + raise bt2_error._MemoryError("cannot create range set object") super().__init__(ptr) diff --git a/src/bindings/python/bt2/bt2/interrupter.py b/src/bindings/python/bt2/bt2/interrupter.py index 658721ad..b926b45e 100644 --- a/src/bindings/python/bt2/bt2/interrupter.py +++ b/src/bindings/python/bt2/bt2/interrupter.py @@ -4,7 +4,7 @@ from bt2 import native_bt from bt2 import object as bt2_object -import bt2 +from bt2 import error as bt2_error class Interrupter(bt2_object._SharedObject): @@ -20,7 +20,7 @@ class Interrupter(bt2_object._SharedObject): ptr = native_bt.interrupter_create() if ptr is None: - raise bt2._MemoryError("cannot create interrupter object") + raise bt2_error._MemoryError("cannot create interrupter object") super().__init__(ptr) diff --git a/src/bindings/python/bt2/bt2/message_iterator.py b/src/bindings/python/bt2/bt2/message_iterator.py index f0a47ec7..ce755e5c 100644 --- a/src/bindings/python/bt2/bt2/message_iterator.py +++ b/src/bindings/python/bt2/bt2/message_iterator.py @@ -12,7 +12,7 @@ from bt2 import event_class as bt2_event_class from bt2 import packet as bt2_packet from bt2 import port as bt2_port from bt2 import clock_class as bt2_clock_class -import bt2 +from bt2 import error as bt2_error class _MessageIterator(collections.abc.Iterator): @@ -167,14 +167,14 @@ class _UserMessageIterator(_MessageIterator): pass def __next__(self): - raise bt2.Stop + raise bt2_utils.Stop def _bt_next_from_native(self): # this can raise anything: it's catched by the native part try: msg = next(self) except StopIteration: - raise bt2.Stop + raise bt2_utils.Stop except Exception: raise @@ -280,7 +280,7 @@ class _UserMessageIterator(_MessageIterator): ) if ptr is None: - raise bt2._MemoryError("cannot create event message object") + raise bt2_error._MemoryError("cannot create event message object") return bt2_message._EventMessage(ptr) @@ -291,7 +291,7 @@ class _UserMessageIterator(_MessageIterator): ) if ptr is None: - raise bt2._MemoryError("cannot create inactivity message object") + raise bt2_error._MemoryError("cannot create inactivity message object") return bt2_message._MessageIteratorInactivityMessage(ptr) @@ -300,7 +300,9 @@ class _UserMessageIterator(_MessageIterator): ptr = native_bt.message_stream_beginning_create(self._bt_ptr, stream._ptr) if ptr is None: - raise bt2._MemoryError("cannot create stream beginning message object") + raise bt2_error._MemoryError( + "cannot create stream beginning message object" + ) msg = bt2_message._StreamBeginningMessage(ptr) @@ -314,7 +316,7 @@ class _UserMessageIterator(_MessageIterator): ptr = native_bt.message_stream_end_create(self._bt_ptr, stream._ptr) if ptr is None: - raise bt2._MemoryError("cannot create stream end message object") + raise bt2_error._MemoryError("cannot create stream end message object") msg = bt2_message._StreamEndMessage(ptr) @@ -345,7 +347,9 @@ class _UserMessageIterator(_MessageIterator): ptr = native_bt.message_packet_beginning_create(self._bt_ptr, packet._ptr) if ptr is None: - raise bt2._MemoryError("cannot create packet beginning message object") + raise bt2_error._MemoryError( + "cannot create packet beginning message object" + ) return bt2_message._PacketBeginningMessage(ptr) @@ -371,7 +375,7 @@ class _UserMessageIterator(_MessageIterator): ptr = native_bt.message_packet_end_create(self._bt_ptr, packet._ptr) if ptr is None: - raise bt2._MemoryError("cannot create packet end message object") + raise bt2_error._MemoryError("cannot create packet end message object") return bt2_message._PacketEndMessage(ptr) @@ -413,7 +417,7 @@ class _UserMessageIterator(_MessageIterator): ptr = native_bt.message_discarded_events_create(self._bt_ptr, stream._ptr) if ptr is None: - raise bt2._MemoryError("cannot discarded events message object") + raise bt2_error._MemoryError("cannot discarded events message object") msg = bt2_message._DiscardedEventsMessage(ptr) @@ -460,7 +464,7 @@ class _UserMessageIterator(_MessageIterator): ptr = native_bt.message_discarded_packets_create(self._bt_ptr, stream._ptr) if ptr is None: - raise bt2._MemoryError("cannot discarded packets message object") + raise bt2_error._MemoryError("cannot discarded packets message object") msg = bt2_message._DiscardedPacketsMessage(ptr) diff --git a/src/bindings/python/bt2/bt2/mip.py b/src/bindings/python/bt2/bt2/mip.py index 96efc032..0cc1f82d 100644 --- a/src/bindings/python/bt2/bt2/mip.py +++ b/src/bindings/python/bt2/bt2/mip.py @@ -4,24 +4,26 @@ from bt2 import native_bt from bt2 import utils as bt2_utils -import bt2 +from bt2 import error as bt2_error +from bt2 import logging as bt2_logging +from bt2 import component_descriptor as bt2_component_descriptor def get_greatest_operative_mip_version( - component_descriptors, log_level=bt2.LoggingLevel.NONE + component_descriptors, log_level=bt2_logging.LoggingLevel.NONE ): bt2_utils._check_log_level(log_level) comp_descr_set_ptr = native_bt.component_descriptor_set_create() if comp_descr_set_ptr is None: - raise bt2._MemoryError("cannot create component descriptor set object") + raise bt2_error._MemoryError("cannot create component descriptor set object") if len(component_descriptors) == 0: raise ValueError("no component descriptors") try: for descr in component_descriptors: - if type(descr) is not bt2.ComponentDescriptor: + if type(descr) is not bt2_component_descriptor.ComponentDescriptor: raise TypeError("'{}' is not a component descriptor".format(descr)) base_cc_ptr = descr.component_class._bt_component_class_ptr() diff --git a/src/bindings/python/bt2/bt2/query_executor.py b/src/bindings/python/bt2/bt2/query_executor.py index ebedffe8..a4927f0c 100644 --- a/src/bindings/python/bt2/bt2/query_executor.py +++ b/src/bindings/python/bt2/bt2/query_executor.py @@ -7,7 +7,7 @@ from bt2 import object as bt2_object from bt2 import utils as bt2_utils from bt2 import interrupter as bt2_interrupter from bt2 import value as bt2_value -import bt2 +from bt2 import error as bt2_error def _bt2_component(): @@ -62,7 +62,7 @@ class QueryExecutor(bt2_object._SharedObject, _QueryExecutorCommon): if params is None: params_ptr = native_bt.value_null else: - params = bt2.create_value(params) + params = bt2_value.create_value(params) params_ptr = params._ptr cc_ptr = component_class._bt_component_class_ptr() @@ -80,7 +80,7 @@ class QueryExecutor(bt2_object._SharedObject, _QueryExecutorCommon): ) if ptr is None: - raise bt2._MemoryError("cannot create query executor object") + raise bt2_error._MemoryError("cannot create query executor object") super().__init__(ptr) diff --git a/src/bindings/python/bt2/bt2/stream.py b/src/bindings/python/bt2/bt2/stream.py index dae698d6..3f4cedef 100644 --- a/src/bindings/python/bt2/bt2/stream.py +++ b/src/bindings/python/bt2/bt2/stream.py @@ -8,7 +8,7 @@ from bt2 import object as bt2_object from bt2 import packet as bt2_packet from bt2 import stream_class as bt2_stream_class from bt2 import value as bt2_value -import bt2 +from bt2 import error as bt2_error def _bt2_trace(): @@ -84,7 +84,7 @@ class _Stream(_StreamConst): packet_ptr = native_bt.packet_create(self._ptr) if packet_ptr is None: - raise bt2._MemoryError("cannot create packet object") + raise bt2_error._MemoryError("cannot create packet object") return bt2_packet._Packet._create_from_ptr(packet_ptr) diff --git a/src/bindings/python/bt2/bt2/trace.py b/src/bindings/python/bt2/bt2/trace.py index 5cbe82c6..32e730e3 100644 --- a/src/bindings/python/bt2/bt2/trace.py +++ b/src/bindings/python/bt2/bt2/trace.py @@ -9,7 +9,8 @@ import collections.abc from bt2 import value as bt2_value from bt2 import stream as bt2_stream from bt2 import stream_class as bt2_stream_class -import bt2 +from bt2 import error as bt2_error + import functools import uuid as uuidp @@ -246,7 +247,7 @@ class _Trace(_TraceConst): ) if stream_ptr is None: - raise bt2._MemoryError("cannot create stream object") + raise bt2_error._MemoryError("cannot create stream object") stream = bt2_stream._Stream._create_from_ptr(stream_ptr) diff --git a/src/bindings/python/bt2/bt2/trace_class.py b/src/bindings/python/bt2/bt2/trace_class.py index c25154e8..f6efe71c 100644 --- a/src/bindings/python/bt2/bt2/trace_class.py +++ b/src/bindings/python/bt2/bt2/trace_class.py @@ -11,10 +11,10 @@ from bt2 import stream_class as bt2_stream_class from bt2 import field_class as bt2_field_class from bt2 import integer_range_set as bt2_integer_range_set from bt2 import trace as bt2_trace +from bt2 import error as bt2_error from bt2 import value as bt2_value import collections.abc import functools -import bt2 def _trace_class_destruction_listener_from_native( @@ -149,7 +149,7 @@ class _TraceClass(_TraceClassConst): trace_ptr = native_bt.trace_create(self._ptr) if trace_ptr is None: - raise bt2._MemoryError("cannot create trace class object") + raise bt2_error._MemoryError("cannot create trace class object") trace = bt2_trace._Trace._create_from_ptr(trace_ptr) @@ -281,7 +281,9 @@ class _TraceClass(_TraceClassConst): def _check_field_class_create_status(self, ptr, type_name): if ptr is None: - raise bt2._MemoryError("cannot create {} field class".format(type_name)) + raise bt2_error._MemoryError( + "cannot create {} field class".format(type_name) + ) @staticmethod def _set_field_class_user_attrs(fc, user_attributes): diff --git a/src/bindings/python/bt2/bt2/trace_collection_message_iterator.py b/src/bindings/python/bt2/bt2/trace_collection_message_iterator.py index 67a713b3..3c50cd17 100644 --- a/src/bindings/python/bt2/bt2/trace_collection_message_iterator.py +++ b/src/bindings/python/bt2/bt2/trace_collection_message_iterator.py @@ -4,13 +4,18 @@ from bt2 import native_bt from bt2 import utils as bt2_utils -import bt2 +from bt2 import logging as bt2_logging import itertools from bt2 import message_iterator as bt2_message_iterator from bt2 import port as bt2_port from bt2 import component as bt2_component from bt2 import value as bt2_value from bt2 import plugin as bt2_plugin +from bt2 import error as bt2_error +from bt2 import query_executor as bt2_query_executor +from bt2 import component_descriptor as bt2_component_descriptor +from bt2 import mip as bt2_mip +from bt2 import graph as bt2_graph import datetime from collections import namedtuple import numbers @@ -27,7 +32,7 @@ class _BaseComponentSpec: if logging_level is not None: bt2_utils._check_log_level(logging_level) - self._params = bt2.create_value(params) + self._params = bt2_value.create_value(params) self._obj = obj self._logging_level = logging_level @@ -51,7 +56,7 @@ class ComponentSpec(_BaseComponentSpec): component_class, params=None, obj=None, - logging_level=bt2.LoggingLevel.NONE, + logging_level=bt2_logging.LoggingLevel.NONE, ): if type(params) is str: params = {"inputs": [params]} @@ -60,12 +65,16 @@ class ComponentSpec(_BaseComponentSpec): is_cc_object = isinstance( component_class, - (bt2._SourceComponentClassConst, bt2._FilterComponentClassConst), + ( + bt2_component._SourceComponentClassConst, + bt2_component._FilterComponentClassConst, + ), ) is_user_cc_type = isinstance( component_class, bt2_component._UserComponentType ) and issubclass( - component_class, (bt2._UserSourceComponent, bt2._UserFilterComponent) + component_class, + (bt2_component._UserSourceComponent, bt2_component._UserFilterComponent), ) if not is_cc_object and not is_user_cc_type: @@ -88,9 +97,9 @@ class ComponentSpec(_BaseComponentSpec): component_class_name, params=None, obj=None, - logging_level=bt2.LoggingLevel.NONE, + logging_level=bt2_logging.LoggingLevel.NONE, ): - plugin = bt2.find_plugin(plugin_name) + plugin = bt2_plugin.find_plugin(plugin_name) if plugin is None: raise ValueError("no such plugin: {}".format(plugin_name)) @@ -125,10 +134,10 @@ class AutoSourceComponentSpec(_BaseComponentSpec): def _auto_discover_source_component_specs(auto_source_comp_specs, plugin_set): # Transform a list of `AutoSourceComponentSpec` in a list of `ComponentSpec` # using the automatic source discovery mechanism. - inputs = bt2.ArrayValue([spec.input for spec in auto_source_comp_specs]) + inputs = bt2_value.ArrayValue([spec.input for spec in auto_source_comp_specs]) if plugin_set is None: - plugin_set = bt2.find_plugins() + plugin_set = bt2_plugin.find_plugins() else: bt2_utils._check_type(plugin_set, bt2_plugin._PluginSet) @@ -137,11 +146,11 @@ def _auto_discover_source_component_specs(auto_source_comp_specs, plugin_set): ) if res_ptr is None: - raise bt2._MemoryError("cannot auto discover source components") + raise bt2_error._MemoryError("cannot auto discover source components") res = bt2_value._create_from_ptr(res_ptr) - assert type(res) is bt2.MapValue + assert type(res) is bt2_value.MapValue assert "status" in res status = res["status"] @@ -149,30 +158,30 @@ def _auto_discover_source_component_specs(auto_source_comp_specs, plugin_set): comp_specs = [] comp_specs_raw = res["results"] - assert type(comp_specs_raw) is bt2.ArrayValue + assert type(comp_specs_raw) is bt2_value.ArrayValue used_input_indices = set() for comp_spec_raw in comp_specs_raw: - assert type(comp_spec_raw) is bt2.ArrayValue + assert type(comp_spec_raw) is bt2_value.ArrayValue assert len(comp_spec_raw) == 4 plugin_name = comp_spec_raw[0] - assert type(plugin_name) is bt2.StringValue + assert type(plugin_name) is bt2_value.StringValue plugin_name = str(plugin_name) class_name = comp_spec_raw[1] - assert type(class_name) is bt2.StringValue + assert type(class_name) is bt2_value.StringValue class_name = str(class_name) comp_inputs = comp_spec_raw[2] - assert type(comp_inputs) is bt2.ArrayValue + assert type(comp_inputs) is bt2_value.ArrayValue comp_orig_indices = comp_spec_raw[3] assert type(comp_orig_indices) - params = bt2.MapValue() - logging_level = bt2.LoggingLevel.NONE + params = bt2_value.MapValue() + logging_level = bt2_logging.LoggingLevel.NONE obj = None # Compute `params` for this component by piling up params given to all @@ -330,7 +339,7 @@ class TraceCollectionMessageIterator(bt2_message_iterator._MessageIterator): # Query the port's component for the `babeltrace.trace-infos` # object which contains the range for each stream, from which we can # compute the intersection of the streams in each trace. - query_exec = bt2.QueryExecutor( + query_exec = bt2_query_executor.QueryExecutor( src_comp_and_spec.spec.component_class, "babeltrace.trace-infos", src_comp_and_spec.spec.params, @@ -392,7 +401,7 @@ class TraceCollectionMessageIterator(bt2_message_iterator._MessageIterator): return self._create_trimmer(begin, end, name) def _create_muxer(self): - plugin = bt2.find_plugin("utils") + plugin = bt2_plugin.find_plugin("utils") if plugin is None: raise RuntimeError('cannot find "utils" plugin (needed for the muxer)') @@ -406,7 +415,7 @@ class TraceCollectionMessageIterator(bt2_message_iterator._MessageIterator): return self._graph.add_component(comp_cls, "muxer") def _create_trimmer(self, begin_ns, end_ns, name): - plugin = bt2.find_plugin("utils") + plugin = bt2_plugin.find_plugin("utils") if plugin is None: raise RuntimeError('cannot find "utils" plugin (needed for the trimmer)') @@ -492,7 +501,7 @@ class TraceCollectionMessageIterator(bt2_message_iterator._MessageIterator): def append_comp_specs_descriptors(descriptors, comp_specs): for comp_spec in comp_specs: descriptors.append( - bt2.ComponentDescriptor( + bt2_component_descriptor.ComponentDescriptor( comp_spec.component_class, comp_spec.params, comp_spec.obj ) ) @@ -508,7 +517,7 @@ class TraceCollectionMessageIterator(bt2_message_iterator._MessageIterator): ) append_comp_specs_descriptors(descriptors, [comp_spec]) - mip_version = bt2.get_greatest_operative_mip_version(descriptors) + mip_version = bt2_mip.get_greatest_operative_mip_version(descriptors) if mip_version is None: msg = "failed to find an operative message interchange protocol version (components are not interoperable)" @@ -517,7 +526,7 @@ class TraceCollectionMessageIterator(bt2_message_iterator._MessageIterator): return mip_version def _build_graph(self): - self._graph = bt2.Graph(self._get_greatest_operative_mip_version()) + self._graph = bt2_graph.Graph(self._get_greatest_operative_mip_version()) self._graph.add_port_added_listener(self._graph_port_added) self._muxer_comp = self._create_muxer() diff --git a/src/bindings/python/bt2/bt2/utils.py b/src/bindings/python/bt2/bt2/utils.py index 849c7a3c..6ce992af 100644 --- a/src/bindings/python/bt2/bt2/utils.py +++ b/src/bindings/python/bt2/bt2/utils.py @@ -2,7 +2,7 @@ # # Copyright (c) 2017 Philippe Proulx -import bt2 + from bt2 import logging as bt2_logging from bt2 import native_bt from bt2 import error as bt2_error @@ -141,30 +141,30 @@ def _handle_func_status(status, msg=None): if status == native_bt.__BT_FUNC_STATUS_ERROR: assert msg is not None - raise bt2._Error(msg) + raise bt2_error._Error(msg) elif status == native_bt.__BT_FUNC_STATUS_MEMORY_ERROR: assert msg is not None - raise bt2._MemoryError(msg) + raise bt2_error._MemoryError(msg) elif status == native_bt.__BT_FUNC_STATUS_END: if msg is None: - raise bt2.Stop + raise Stop else: - raise bt2.Stop(msg) + raise Stop(msg) elif status == native_bt.__BT_FUNC_STATUS_AGAIN: if msg is None: - raise bt2.TryAgain + raise TryAgain else: - raise bt2.TryAgain(msg) + raise TryAgain(msg) elif status == native_bt.__BT_FUNC_STATUS_OVERFLOW_ERROR: if msg is None: - raise bt2._OverflowError + raise _OverflowError else: - raise bt2._OverflowError(msg) + raise _OverflowError(msg) elif status == native_bt.__BT_FUNC_STATUS_UNKNOWN_OBJECT: if msg is None: - raise bt2.UnknownObject + raise UnknownObject else: - raise bt2.UnknownObject(msg) + raise UnknownObject(msg) else: assert False diff --git a/src/bindings/python/bt2/bt2/value.py b/src/bindings/python/bt2/bt2/value.py index 7bdd512e..d2cb4e07 100644 --- a/src/bindings/python/bt2/bt2/value.py +++ b/src/bindings/python/bt2/bt2/value.py @@ -5,12 +5,12 @@ from bt2 import native_bt from bt2 import object as bt2_object from bt2 import utils as bt2_utils +from bt2 import error as bt2_error import collections.abc import functools import numbers import math import abc -import bt2 def _create_from_ptr_template(ptr, object_map): @@ -102,7 +102,7 @@ class _ValueConst(bt2_object._SharedObject, metaclass=abc.ABCMeta): def _check_create_status(self, ptr): if ptr is None: - raise bt2._MemoryError( + raise bt2_error._MemoryError( "cannot create {} value object".format(self._NAME.lower()) ) -- 2.34.1