X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Ffield.py;h=eb11107c093cc8fcd83953e104de8ed29f65f9fd;hb=57081273d1191fc79edc101af619fab96b72460d;hp=7d68d0e08ae58a2d3d69abb1eba438a4bda6b9a0;hpb=3dc0614bb91af3ef70b5f5414318e5f2e052e582;p=babeltrace.git diff --git a/src/bindings/python/bt2/bt2/field.py b/src/bindings/python/bt2/bt2/field.py index 7d68d0e0..eb11107c 100644 --- a/src/bindings/python/bt2/bt2/field.py +++ b/src/bindings/python/bt2/bt2/field.py @@ -21,20 +21,19 @@ # THE SOFTWARE. from bt2 import native_bt, object, utils -import bt2.field_class +from bt2 import field_class as bt2_field_class import collections.abc import functools import numbers import math -import bt2 def _create_field_from_ptr(ptr, owner_ptr, owner_get_ref, owner_put_ref): field_class_ptr = native_bt.field_borrow_class_const(ptr) - utils._handle_ptr(field_class_ptr, "cannot get field object's class") typeid = native_bt.field_class_get_type(field_class_ptr) field = _TYPE_ID_TO_OBJ[typeid]._create_from_ptr_and_get_ref( - ptr, owner_ptr, owner_get_ref, owner_put_ref) + ptr, owner_ptr, owner_get_ref, owner_put_ref + ) return field @@ -42,6 +41,7 @@ def _create_field_from_ptr(ptr, owner_ptr, owner_get_ref, owner_put_ref): # currently selected field. If `field` is of any other type, return `field` # directly. + def _get_leaf_field(field): if not isinstance(field, _VariantField): return field @@ -58,7 +58,7 @@ class _Field(object._UniqueObject): def field_class(self): field_class_ptr = native_bt.field_borrow_class_const(self._ptr) assert field_class_ptr is not None - return bt2.field_class._create_field_class_from_ptr_and_get_ref(field_class_ptr) + return bt2_field_class._create_field_class_from_ptr_and_get_ref(field_class_ptr) def _repr(self): raise NotImplementedError @@ -83,7 +83,9 @@ class _NumericField(_Field): if isinstance(other, numbers.Complex): return complex(other) - raise TypeError("'{}' object is not a number object".format(other.__class__.__name__)) + raise TypeError( + "'{}' object is not a number object".format(other.__class__.__name__) + ) def __int__(self): return int(self._value) @@ -96,8 +98,11 @@ class _NumericField(_Field): def __lt__(self, other): if not isinstance(other, numbers.Number): - raise TypeError('unorderable types: {}() < {}()'.format(self.__class__.__name__, - other.__class__.__name__)) + raise TypeError( + 'unorderable types: {}() < {}()'.format( + self.__class__.__name__, other.__class__.__name__ + ) + ) return self._value < self._extract_value(other) @@ -211,8 +216,8 @@ class _UnsignedIntegerField(_IntegerField, _Field): _NAME = 'Unsigned integer' def _value_to_int(self, value): - if not isinstance(value, numbers.Real): - raise TypeError('expecting a real number object') + if not isinstance(value, numbers.Integral): + raise TypeError('expecting an integral number object') value = int(value) utils._check_uint64(value) @@ -221,11 +226,11 @@ class _UnsignedIntegerField(_IntegerField, _Field): @property def _value(self): - return native_bt.field_unsigned_integer_get_value(self._ptr) + return native_bt.field_integer_unsigned_get_value(self._ptr) def _set_value(self, value): value = self._value_to_int(value) - native_bt.field_unsigned_integer_set_value(self._ptr, value) + native_bt.field_integer_unsigned_set_value(self._ptr, value) value = property(fset=_set_value) @@ -234,8 +239,8 @@ class _SignedIntegerField(_IntegerField, _Field): _NAME = 'Signed integer' def _value_to_int(self, value): - if not isinstance(value, numbers.Real): - raise TypeError('expecting a real number object') + if not isinstance(value, numbers.Integral): + raise TypeError('expecting an integral number object') value = int(value) utils._check_int64(value) @@ -244,11 +249,11 @@ class _SignedIntegerField(_IntegerField, _Field): @property def _value(self): - return native_bt.field_signed_integer_get_value(self._ptr) + return native_bt.field_integer_signed_get_value(self._ptr) def _set_value(self, value): value = self._value_to_int(value) - native_bt.field_signed_integer_set_value(self._ptr, value) + native_bt.field_integer_signed_set_value(self._ptr, value) value = property(fset=_set_value) @@ -279,8 +284,8 @@ class _EnumerationField(_IntegerField): @property def labels(self): - ret, labels = self._get_mapping_labels(self._ptr) - utils._handle_ret(ret, "cannot get label for enumeration field") + status, labels = self._get_mapping_labels(self._ptr) + utils._handle_func_status(status, "cannot get label for enumeration field") assert labels is not None return labels @@ -288,12 +293,16 @@ class _EnumerationField(_IntegerField): class _UnsignedEnumerationField(_EnumerationField, _UnsignedIntegerField): _NAME = 'Unsigned Enumeration' - _get_mapping_labels = staticmethod(native_bt.field_unsigned_enumeration_get_mapping_labels) + _get_mapping_labels = staticmethod( + native_bt.field_enumeration_unsigned_get_mapping_labels + ) class _SignedEnumerationField(_EnumerationField, _SignedIntegerField): _NAME = 'Signed Enumeration' - _get_mapping_labels = staticmethod(native_bt.field_signed_enumeration_get_mapping_labels) + _get_mapping_labels = staticmethod( + native_bt.field_enumeration_signed_get_mapping_labels + ) @functools.total_ordering @@ -345,8 +354,10 @@ class _StringField(_Field): def __iadd__(self, value): value = self._value_to_str(value) - ret = native_bt.field_string_append(self._ptr, value) - utils._handle_ret(ret, "cannot append to string field object's value") + status = native_bt.field_string_append(self._ptr, value) + utils._handle_func_status( + status, "cannot append to string field object's value" + ) return self @@ -413,14 +424,16 @@ class _StructureField(_ContainerField, collections.abc.MutableMapping): def __getitem__(self, key): utils._check_str(key) - field_ptr = native_bt.field_structure_borrow_member_field_by_name(self._ptr, key) + field_ptr = native_bt.field_structure_borrow_member_field_by_name( + self._ptr, key + ) if field_ptr is None: raise KeyError(key) - return _create_field_from_ptr(field_ptr, self._owner_ptr, - self._owner_get_ref, - self._owner_put_ref) + return _create_field_from_ptr( + field_ptr, self._owner_ptr, self._owner_get_ref, self._owner_put_ref + ) def member_at_index(self, index): utils._check_uint64(index) @@ -428,11 +441,13 @@ class _StructureField(_ContainerField, collections.abc.MutableMapping): if index >= len(self): raise IndexError - field_ptr = native_bt.field_structure_borrow_member_field_by_index(self._ptr, index) + field_ptr = native_bt.field_structure_borrow_member_field_by_index( + self._ptr, index + ) assert field_ptr is not None - return _create_field_from_ptr(field_ptr, self._owner_ptr, - self._owner_get_ref, - self._owner_put_ref) + return _create_field_from_ptr( + field_ptr, self._owner_ptr, self._owner_get_ref, self._owner_put_ref + ) class _VariantField(_ContainerField, _Field): @@ -444,16 +459,18 @@ class _VariantField(_ContainerField, _Field): @selected_option_index.setter def selected_option_index(self, index): - native_bt.field_variant_select_option_field(self._ptr, index) + native_bt.field_variant_select_option_field_by_index(self._ptr, index) @property def selected_option(self): + # TODO: Is there a way to check if the variant field has a selected_option, + # so we can raise an exception instead of hitting a pre-condition check? + # If there is something, that check should be added to selected_option_index too. field_ptr = native_bt.field_variant_borrow_selected_option_field(self._ptr) - utils._handle_ptr(field_ptr, "cannot get variant field's selected option") - return _create_field_from_ptr(field_ptr, self._owner_ptr, - self._owner_get_ref, - self._owner_put_ref) + return _create_field_from_ptr( + field_ptr, self._owner_ptr, self._owner_get_ref, self._owner_put_ref + ) def _spec_eq(self, other): return _get_leaf_field(self) == other @@ -481,24 +498,26 @@ class _ArrayField(_ContainerField, _Field, collections.abc.MutableSequence): def __getitem__(self, index): if not isinstance(index, numbers.Integral): - raise TypeError("'{}' is not an integral number object: invalid index".format(index.__class__.__name__)) + raise TypeError( + "'{}' is not an integral number object: invalid index".format( + index.__class__.__name__ + ) + ) index = int(index) if index < 0 or index >= len(self): raise IndexError('{} field object index is out of range'.format(self._NAME)) - field_ptr = native_bt.field_array_borrow_element_field_by_index(self._ptr, index) - assert(field_ptr) - return _create_field_from_ptr(field_ptr, self._owner_ptr, - self._owner_get_ref, - self._owner_put_ref) + field_ptr = native_bt.field_array_borrow_element_field_by_index( + self._ptr, index + ) + assert field_ptr + return _create_field_from_ptr( + field_ptr, self._owner_ptr, self._owner_get_ref, self._owner_put_ref + ) def __setitem__(self, index, value): - # we can only set numbers and strings - if not isinstance(value, (numbers.Number, _StringField, str)): - raise TypeError('expecting number or string object') - # raises if index is somehow invalid field = self[index] @@ -538,8 +557,7 @@ class _StaticArrayField(_ArrayField, _Field): def _set_value(self, values): if len(self) != len(values): - raise ValueError( - 'expected length of value and array field to match') + raise ValueError('expected length of value and array field to match') for index, value in enumerate(values): if value is not None: @@ -556,8 +574,8 @@ class _DynamicArrayField(_ArrayField, _Field): def _set_length(self, length): utils._check_uint64(length) - ret = native_bt.field_dynamic_array_set_length(self._ptr, length) - utils._handle_ret(ret, "cannot set dynamic array length") + status = native_bt.field_array_dynamic_set_length(self._ptr, length) + utils._handle_func_status(status, "cannot set dynamic array length") length = property(fget=_ArrayField._get_length, fset=_set_length) @@ -582,5 +600,7 @@ _TYPE_ID_TO_OBJ = { native_bt.FIELD_CLASS_TYPE_STRUCTURE: _StructureField, native_bt.FIELD_CLASS_TYPE_STATIC_ARRAY: _StaticArrayField, native_bt.FIELD_CLASS_TYPE_DYNAMIC_ARRAY: _DynamicArrayField, - native_bt.FIELD_CLASS_TYPE_VARIANT: _VariantField, + native_bt.FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR: _VariantField, + native_bt.FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: _VariantField, + native_bt.FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: _VariantField, }