From 15012c4b5e7049bb09e8d53e84e0a2a3d1b2de5c Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Fri, 15 Sep 2017 22:49:01 -0400 Subject: [PATCH] Python bt2 fix: erroneous imports following split of clock class and value MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- bindings/python/bt2/Makefile.am | 1 + bindings/python/bt2/bt2/clock_class.py | 4 ++-- bindings/python/bt2/bt2/clock_value.py | 2 +- bindings/python/bt2/bt2/event.py | 5 +++-- bindings/python/bt2/bt2/notification.py | 13 +++++++------ 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/bindings/python/bt2/Makefile.am b/bindings/python/bt2/Makefile.am index d35a3adb..f8ae782a 100644 --- a/bindings/python/bt2/Makefile.am +++ b/bindings/python/bt2/Makefile.am @@ -35,6 +35,7 @@ STATIC_BINDINGS_DEPS = \ bt2/native_btversion.i \ bt2/clock_class_priority_map.py \ bt2/clock_class.py \ + bt2/clock_value.py \ bt2/component.py \ bt2/connection.py \ bt2/ctf_writer.py \ diff --git a/bindings/python/bt2/bt2/clock_class.py b/bindings/python/bt2/bt2/clock_class.py index 552ac61d..161d365d 100644 --- a/bindings/python/bt2/bt2/clock_class.py +++ b/bindings/python/bt2/bt2/clock_class.py @@ -24,7 +24,7 @@ from bt2 import native_bt, object, utils import uuid as uuidp import numbers import bt2 - +import bt2.clock_value as clock_value class ClockClassOffset: def __init__(self, seconds=0, cycles=0): @@ -219,5 +219,5 @@ class ClockClass(object._Object): utils._handle_ret(ret, "cannot set clock class object's UUID") def __call__(self, cycles): - return _ClockValue(self._ptr, cycles) + return clock_value._ClockValue(self._ptr, cycles) diff --git a/bindings/python/bt2/bt2/clock_value.py b/bindings/python/bt2/bt2/clock_value.py index e35bc8ee..d662b96a 100644 --- a/bindings/python/bt2/bt2/clock_value.py +++ b/bindings/python/bt2/bt2/clock_value.py @@ -45,7 +45,7 @@ class _ClockValue(object._Object): def clock_class(self): ptr = native_bt.ctf_clock_value_get_class(self._ptr) assert(ptr) - return ClockClass._create_from_ptr(ptr) + return bt2.ClockClass._create_from_ptr(ptr) @property def cycles(self): diff --git a/bindings/python/bt2/bt2/event.py b/bindings/python/bt2/bt2/event.py index 2e11de08..a6f966d0 100644 --- a/bindings/python/bt2/bt2/event.py +++ b/bindings/python/bt2/bt2/event.py @@ -25,6 +25,7 @@ import bt2.clock_class import bt2.packet import bt2.stream import bt2.fields +import bt2.clock_value import numbers import copy import abc @@ -181,11 +182,11 @@ class _Event(object._Object): if clock_value_ptr is None: return - clock_value = bt2.clock_class._create_clock_value_from_ptr(clock_value_ptr) + clock_value = bt2.clock_value._create_clock_value_from_ptr(clock_value_ptr) return clock_value def add_clock_value(self, clock_value): - utils._check_type(clock_value, bt2.clock_class._ClockValue) + utils._check_type(clock_value, bt2.clock_value._ClockValue) ret = native_bt.ctf_event_set_clock_value(self._ptr, clock_value._ptr) utils._handle_ret(ret, "cannot set event object's clock value") diff --git a/bindings/python/bt2/bt2/notification.py b/bindings/python/bt2/bt2/notification.py index c144ed4b..dab9909e 100644 --- a/bindings/python/bt2/bt2/notification.py +++ b/bindings/python/bt2/bt2/notification.py @@ -22,6 +22,7 @@ from bt2 import native_bt, object, utils import bt2.clock_class_priority_map +import bt2.clock_value import bt2.packet import bt2.stream import bt2.event @@ -293,11 +294,11 @@ class InactivityNotification(_CopyableNotification): if clock_value_ptr is None: return - clock_value = bt2.clock_class._create_clock_value_from_ptr(clock_value_ptr) + clock_value = bt2.clock_value._create_clock_value_from_ptr(clock_value_ptr) return clock_value def add_clock_value(self, clock_value): - utils._check_type(clock_value, bt2.clock_class._ClockValue) + utils._check_type(clock_value, bt2.clock_value._ClockValue) ret = native_bt.notification_inactivity_set_clock_value(self._ptr, clock_value._ptr) utils._handle_ret(ret, "cannot set inactivity notification object's clock value") @@ -416,7 +417,7 @@ class _DiscardedPacketsNotification(_DiscardedElementsNotification): if clock_value_ptr is None: return - clock_value = bt2.clock_class._create_clock_value_from_ptr(clock_value_ptr) + clock_value = bt2.clock_value._create_clock_value_from_ptr(clock_value_ptr) return clock_value @property @@ -426,7 +427,7 @@ class _DiscardedPacketsNotification(_DiscardedElementsNotification): if clock_value_ptr is None: return - clock_value = bt2.clock_class._create_clock_value_from_ptr(clock_value_ptr) + clock_value = bt2.clock_value._create_clock_value_from_ptr(clock_value_ptr) return clock_value @@ -452,7 +453,7 @@ class _DiscardedEventsNotification(_DiscardedElementsNotification): if clock_value_ptr is None: return - clock_value = bt2.clock_class._create_clock_value_from_ptr(clock_value_ptr) + clock_value = bt2.clock_value._create_clock_value_from_ptr(clock_value_ptr) return clock_value @property @@ -462,7 +463,7 @@ class _DiscardedEventsNotification(_DiscardedElementsNotification): if clock_value_ptr is None: return - clock_value = bt2.clock_class._create_clock_value_from_ptr(clock_value_ptr) + clock_value = bt2.clock_value._create_clock_value_from_ptr(clock_value_ptr) return clock_value -- 2.34.1