From 0b03f63ebcb84ec3f7c215aec65ddf93674bf7fc Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 22 Sep 2017 15:37:52 -0400 Subject: [PATCH] bt2, babeltrace: apply PEP 8 except for E501 and E722 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- .../python/babeltrace/babeltrace/common.py | 1 + .../python/babeltrace/babeltrace/reader.py | 1 + .../babeltrace/babeltrace/reader_event.py | 2 ++ .../babeltrace/reader_event_declaration.py | 3 +++ .../babeltrace/reader_field_declaration.py | 1 + .../babeltrace/reader_field_definition.py | 2 ++ .../python/babeltrace/babeltrace/writer.py | 7 ++++--- bindings/python/bt2/bt2/__init__.py.in | 20 +++++++++++-------- bindings/python/bt2/bt2/clock_class.py | 2 +- bindings/python/bt2/bt2/event.py | 8 ++++---- bindings/python/bt2/bt2/field_types.py | 8 ++++---- bindings/python/bt2/bt2/fields.py | 5 +++++ bindings/python/bt2/bt2/stream_class.py | 10 +++++----- bindings/python/bt2/bt2/trace.py | 15 +++++++------- bindings/python/bt2/bt2/utils.py | 1 + 15 files changed, 53 insertions(+), 33 deletions(-) diff --git a/bindings/python/babeltrace/babeltrace/common.py b/bindings/python/babeltrace/babeltrace/common.py index 24e7e45d..1dffa1bb 100644 --- a/bindings/python/babeltrace/babeltrace/common.py +++ b/bindings/python/babeltrace/babeltrace/common.py @@ -20,6 +20,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. + class CTFStringEncoding: """ CTF string encodings. diff --git a/bindings/python/babeltrace/babeltrace/reader.py b/bindings/python/babeltrace/babeltrace/reader.py index 627cbd9c..42c20e0c 100644 --- a/bindings/python/babeltrace/babeltrace/reader.py +++ b/bindings/python/babeltrace/babeltrace/reader.py @@ -28,6 +28,7 @@ from babeltrace.reader_field_definition import * from babeltrace.reader_trace_collection import * from babeltrace.reader_trace_handle import * + # Based on enum bt_clock_type in clock-type.h class _ClockType: CLOCK_CYCLES = 0 diff --git a/bindings/python/babeltrace/babeltrace/reader_event.py b/bindings/python/babeltrace/babeltrace/reader_event.py index de2b23e2..4ed4de3d 100644 --- a/bindings/python/babeltrace/babeltrace/reader_event.py +++ b/bindings/python/babeltrace/babeltrace/reader_event.py @@ -26,6 +26,7 @@ import babeltrace.reader_field_definition as field_definition import datetime import collections + def _create_event(event_notification, trace_handle=None, trace_collection=None): event = Event.__new__(Event) event._event_notification = event_notification @@ -33,6 +34,7 @@ def _create_event(event_notification, trace_handle=None, trace_collection=None): event._trace_collection = trace_collection return event + class Event(collections.Mapping): """ An :class:`Event` object represents a trace event. :class:`Event` diff --git a/bindings/python/babeltrace/babeltrace/reader_event_declaration.py b/bindings/python/babeltrace/babeltrace/reader_event_declaration.py index 7959bf63..a88f37c9 100644 --- a/bindings/python/babeltrace/babeltrace/reader_event_declaration.py +++ b/bindings/python/babeltrace/babeltrace/reader_event_declaration.py @@ -25,11 +25,13 @@ import babeltrace.common as common import babeltrace.reader_field_declaration as field_declaration import collections + def _create_event_declaration(event_class): event_declaration = EventDeclaration.__new__(EventDeclaration) event_declaration._event_class = event_class return event_declaration + class EventDeclaration: """ An event declaration contains the properties of a class of events, @@ -138,6 +140,7 @@ class EventDeclaration: yield field_declaration._create_field_declaration(field_type, name, scope) + # Priority of the scopes when searching for event fields _SCOPES = [ common.CTFScope.EVENT_FIELDS, diff --git a/bindings/python/babeltrace/babeltrace/reader_field_declaration.py b/bindings/python/babeltrace/babeltrace/reader_field_declaration.py index 6e6ef195..aa4f75cf 100644 --- a/bindings/python/babeltrace/babeltrace/reader_field_declaration.py +++ b/bindings/python/babeltrace/babeltrace/reader_field_declaration.py @@ -23,6 +23,7 @@ import bt2 import babeltrace.common as common + def _create_field_declaration(field_type, name, scope): try: if type(field_type) == bt2.IntegerFieldType: diff --git a/bindings/python/babeltrace/babeltrace/reader_field_definition.py b/bindings/python/babeltrace/babeltrace/reader_field_definition.py index 1485e5be..278ca00c 100644 --- a/bindings/python/babeltrace/babeltrace/reader_field_definition.py +++ b/bindings/python/babeltrace/babeltrace/reader_field_definition.py @@ -24,6 +24,7 @@ import bt2 import babeltrace.common as common import babeltrace.reader_field_declaration as reader_field_declaration + class FieldError(Exception): """ Field error, raised when the value of a field cannot be accessed. @@ -35,6 +36,7 @@ class FieldError(Exception): def __str__(self): return repr(self.value) + class _Definition: def __init__(self, scope_id, field, name): self._scope_id = scope_id diff --git a/bindings/python/babeltrace/babeltrace/writer.py b/bindings/python/babeltrace/babeltrace/writer.py index d5f282e6..04b13787 100644 --- a/bindings/python/babeltrace/babeltrace/writer.py +++ b/bindings/python/babeltrace/babeltrace/writer.py @@ -27,6 +27,7 @@ import babeltrace.common as common import bt2 + class EnumerationMapping: """ Mapping from an enumeration label to a range of integers. @@ -334,6 +335,7 @@ _ENCODING_TO_BT2_ENCODING = { common.CTFStringEncoding.UTF8: bt2.Encoding.UTF8, } + class FieldDeclaration: """ Base class of all field declarations. This class is not meant to @@ -679,7 +681,6 @@ class FloatingPointFieldDeclaration(FieldDeclaration): raise TypeError( "Could not get Floating point exponent digit count") - @exponent_digits.setter def exponent_digits(self, exponent_digits): try: @@ -705,7 +706,6 @@ class FloatingPointFieldDeclaration(FieldDeclaration): raise TypeError( "Could not get Floating point mantissa digit count") - @mantissa_digits.setter def mantissa_digits(self, mantissa_digits): try: @@ -803,7 +803,7 @@ class VariantFieldDeclaration(FieldDeclaration): raise TypeError("Invalid tag type; must be of type EnumerationFieldDeclaration.") self._field_type = bt2.VariantFieldType(tag_name=tag_name, - tag_field_type=enum_tag._field_type) + tag_field_type=enum_tag._field_type) super().__init__() @property @@ -1583,6 +1583,7 @@ class Event: except: raise ValueError("Invalid stream context field.") + class StreamClass: """ A stream class contains the properties of specific diff --git a/bindings/python/bt2/bt2/__init__.py.in b/bindings/python/bt2/bt2/__init__.py.in index 487addeb..dffc7f21 100644 --- a/bindings/python/bt2/bt2/__init__.py.in +++ b/bindings/python/bt2/bt2/__init__.py.in @@ -151,14 +151,18 @@ class _ListenerHandle: self._obj = obj -import bt2.native_bt as _native_bt -import atexit - -atexit.register(_native_bt.py3_cc_exit_handler) -version = (_native_bt.version_get_major(), _native_bt.version_get_minor(), - _native_bt.version_get_patch(), _native_bt.version_get_extra()) -_native_bt.py3_cc_init_from_bt2() -del _native_bt +def _init_and_register_exit(): + import bt2.native_bt as _native_bt + import atexit + + atexit.register(_native_bt.py3_cc_exit_handler) + version = (_native_bt.version_get_major(), _native_bt.version_get_minor(), + _native_bt.version_get_patch(), _native_bt.version_get_extra()) + _native_bt.py3_cc_init_from_bt2() + + +_init_and_register_exit() + try: del native_bt diff --git a/bindings/python/bt2/bt2/clock_class.py b/bindings/python/bt2/bt2/clock_class.py index 229121ed..6aed8928 100644 --- a/bindings/python/bt2/bt2/clock_class.py +++ b/bindings/python/bt2/bt2/clock_class.py @@ -26,6 +26,7 @@ import numbers import bt2 import bt2.clock_value as clock_value + class ClockClassOffset: def __init__(self, seconds=0, cycles=0): utils._check_int64(seconds) @@ -220,4 +221,3 @@ class ClockClass(object._Object): def __call__(self, cycles): return clock_value._ClockValue(self._ptr, cycles) - diff --git a/bindings/python/bt2/bt2/event.py b/bindings/python/bt2/bt2/event.py index b1b6875d..aa134094 100644 --- a/bindings/python/bt2/bt2/event.py +++ b/bindings/python/bt2/bt2/event.py @@ -119,7 +119,7 @@ class _Event(object._Object): stream_event_context_ptr = stream_event_context._ptr ret = native_bt.event_set_stream_event_context(self._ptr, - stream_event_context_ptr) + stream_event_context_ptr) utils._handle_ret(ret, "cannot set event object's stream event context field") @property @@ -164,7 +164,7 @@ class _Event(object._Object): def _get_clock_value_cycles(self, clock_class_ptr): clock_value_ptr = native_bt.event_get_clock_value(self._ptr, - clock_class_ptr) + clock_class_ptr) if clock_value_ptr is None: return @@ -177,7 +177,7 @@ class _Event(object._Object): def clock_value(self, clock_class): utils._check_type(clock_class, bt2.ClockClass) clock_value_ptr = native_bt.event_get_clock_value(self._ptr, - clock_class._ptr) + clock_class._ptr) if clock_value_ptr is None: return @@ -188,7 +188,7 @@ class _Event(object._Object): def add_clock_value(self, clock_value): utils._check_type(clock_value, bt2.clock_value._ClockValue) ret = native_bt.event_set_clock_value(self._ptr, - clock_value._ptr) + clock_value._ptr) utils._handle_ret(ret, "cannot set event object's clock value") def __getitem__(self, key): diff --git a/bindings/python/bt2/bt2/field_types.py b/bindings/python/bt2/bt2/field_types.py index e157492b..d954ffdd 100644 --- a/bindings/python/bt2/bt2/field_types.py +++ b/bindings/python/bt2/bt2/field_types.py @@ -554,7 +554,7 @@ class StructureFieldType(_FieldType, _FieldContainer, _AlignmentProp): def _add_field(self, ptr, name): return native_bt.field_type_structure_add_field(self._ptr, ptr, - name) + name) def _at(self, index): if index < 0 or index >= len(self): @@ -579,7 +579,7 @@ class _VariantFieldTypeFieldIterator(collections.abc.Iterator): raise StopIteration ret, name, field_type_ptr = native_bt.field_type_variant_get_field_by_index(self._variant_field_type._ptr, - self._at) + self._at) assert(ret == 0) native_bt.put(field_type_ptr) self._at += 1 @@ -600,7 +600,7 @@ class VariantFieldType(_FieldType, _FieldContainer, _AlignmentProp): tag_ft_ptr = tag_field_type._ptr ptr = native_bt.field_type_variant_create(tag_ft_ptr, - tag_name) + tag_name) self._check_create_status(ptr) super().__init__(ptr) @@ -673,7 +673,7 @@ class SequenceFieldType(_FieldType): utils._check_type(element_field_type, _FieldType) utils._check_str(length_name) ptr = native_bt.field_type_sequence_create(element_field_type._ptr, - length_name) + length_name) self._check_create_status(ptr) super().__init__(ptr) diff --git a/bindings/python/bt2/bt2/fields.py b/bindings/python/bt2/bt2/fields.py index 8f0d3203..507f047f 100644 --- a/bindings/python/bt2/bt2/fields.py +++ b/bindings/python/bt2/bt2/fields.py @@ -324,6 +324,7 @@ class _IntegerField(_IntegralField): value = property(fset=_set_value) + class _FloatingPointNumberField(_RealField): _NAME = 'Floating point number' @@ -352,6 +353,7 @@ class _FloatingPointNumberField(_RealField): value = property(fset=_set_value) + class _EnumerationField(_IntegerField): _NAME = 'Enumeration' @@ -520,6 +522,7 @@ class _StructureField(_ContainerField, collections.abc.MutableMapping): value = property(fset=_set_value) + class _VariantField(_Field): _NAME = 'Variant' @@ -565,6 +568,7 @@ class _VariantField(_Field): value = property(fset=_set_value) + class _ArraySequenceField(_ContainerField, collections.abc.MutableSequence): def __getitem__(self, index): if not isinstance(index, numbers.Integral): @@ -693,6 +697,7 @@ class _SequenceField(_ArraySequenceField): value = property(fset=_set_value) + _TYPE_ID_TO_OBJ = { native_bt.FIELD_TYPE_ID_INTEGER: _IntegerField, native_bt.FIELD_TYPE_ID_FLOAT: _FloatingPointNumberField, diff --git a/bindings/python/bt2/bt2/stream_class.py b/bindings/python/bt2/bt2/stream_class.py index 24ac9d99..514dfbb2 100644 --- a/bindings/python/bt2/bt2/stream_class.py +++ b/bindings/python/bt2/bt2/stream_class.py @@ -39,7 +39,7 @@ class _EventClassIterator(collections.abc.Iterator): raise StopIteration ec_ptr = native_bt.stream_class_get_event_class_by_index(self._stream_class._ptr, - self._at) + self._at) assert(ec_ptr) ev_id = native_bt.event_class_get_id(ec_ptr) native_bt.put(ec_ptr) @@ -81,7 +81,7 @@ class StreamClass(object._Object, collections.abc.Mapping): def __getitem__(self, key): utils._check_int64(key) ec_ptr = native_bt.stream_class_get_event_class_by_id(self._ptr, - key) + key) if ec_ptr is None: raise KeyError(key) @@ -166,7 +166,7 @@ class StreamClass(object._Object, collections.abc.Mapping): packet_context_field_type_ptr = packet_context_field_type._ptr ret = native_bt.stream_class_set_packet_context_type(self._ptr, - packet_context_field_type_ptr) + packet_context_field_type_ptr) utils._handle_ret(ret, "cannot set stream class object's packet context field type") @property @@ -187,7 +187,7 @@ class StreamClass(object._Object, collections.abc.Mapping): event_header_field_type_ptr = event_header_field_type._ptr ret = native_bt.stream_class_set_event_header_type(self._ptr, - event_header_field_type_ptr) + event_header_field_type_ptr) utils._handle_ret(ret, "cannot set stream class object's event header field type") @property @@ -208,7 +208,7 @@ class StreamClass(object._Object, collections.abc.Mapping): event_context_field_type_ptr = event_context_field_type._ptr ret = native_bt.stream_class_set_event_context_type(self._ptr, - event_context_field_type_ptr) + event_context_field_type_ptr) utils._handle_ret(ret, "cannot set stream class object's event context field type") def __call__(self, name=None, id=None): diff --git a/bindings/python/bt2/bt2/trace.py b/bindings/python/bt2/bt2/trace.py index 98182487..cd0cd14b 100644 --- a/bindings/python/bt2/bt2/trace.py +++ b/bindings/python/bt2/bt2/trace.py @@ -39,7 +39,7 @@ class _StreamClassIterator(collections.abc.Iterator): raise StopIteration sc_ptr = native_bt.trace_get_stream_class_by_index(self._trace._ptr, - self._at) + self._at) assert(sc_ptr) id = native_bt.stream_class_get_id(sc_ptr) native_bt.put(sc_ptr) @@ -64,7 +64,7 @@ class _TraceStreams(collections.abc.Sequence): raise IndexError stream_ptr = native_bt.trace_get_stream_by_index(self._trace._ptr, - index) + index) assert(stream_ptr) return bt2.stream._create_from_ptr(stream_ptr) @@ -94,8 +94,7 @@ class _TraceClockClasses(collections.abc.Mapping): def __getitem__(self, key): utils._check_str(key) - cc_ptr = native_bt.trace_get_clock_class_by_name(self._trace._ptr, - key) + cc_ptr = native_bt.trace_get_clock_class_by_name(self._trace._ptr, key) if cc_ptr is None: raise KeyError(key) @@ -122,7 +121,7 @@ class _TraceEnvIterator(collections.abc.Iterator): trace_ptr = self._trace_env._trace._ptr entry_name = native_bt.trace_get_environment_field_name_by_index(trace_ptr, - self._at) + self._at) assert(entry_name is not None) self._at += 1 return entry_name @@ -135,7 +134,7 @@ class _TraceEnv(collections.abc.MutableMapping): def __getitem__(self, key): utils._check_str(key) value_ptr = native_bt.trace_get_environment_field_value_by_name(self._trace._ptr, - key) + key) if value_ptr is None: raise KeyError(key) @@ -146,7 +145,7 @@ class _TraceEnv(collections.abc.MutableMapping): utils._check_str(key) value = bt2.create_value(value) ret = native_bt.trace_set_environment_field(self._trace._ptr, - key, value._ptr) + key, value._ptr) utils._handle_ret(ret, "cannot set trace class object's environment entry") def __delitem__(self, key): @@ -281,7 +280,7 @@ class Trace(object._Object, collections.abc.Mapping): packet_header_field_type_ptr = packet_header_field_type._ptr ret = native_bt.trace_set_packet_header_type(self._ptr, - packet_header_field_type_ptr) + packet_header_field_type_ptr) utils._handle_ret(ret, "cannot set trace class object's packet header field type") def __eq__(self, other): diff --git a/bindings/python/bt2/bt2/utils.py b/bindings/python/bt2/bt2/utils.py index 0c59a4d7..bd8ebf8e 100644 --- a/bindings/python/bt2/bt2/utils.py +++ b/bindings/python/bt2/bt2/utils.py @@ -98,6 +98,7 @@ def _raise_bt2_error(msg): else: raise bt2.Error(msg) + def _handle_ret(ret, msg=None): if int(ret) < 0: _raise_bt2_error(msg) -- 2.34.1