From 699347e4616515bec3d596fc30e314a5c95f38e6 Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Fri, 7 Jun 2019 10:42:40 +0200 Subject: [PATCH] Simplify imports --- tracetools_analysis/convert.py | 4 ++-- tracetools_analysis/process.py | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tracetools_analysis/convert.py b/tracetools_analysis/convert.py index 3a41428..049bd16 100644 --- a/tracetools_analysis/convert.py +++ b/tracetools_analysis/convert.py @@ -4,7 +4,7 @@ import sys from pickle import Pickler -from tracetools_analysis.conversion.ctf import * +from tracetools_analysis.conversion import ctf def main(argv=sys.argv): if len(argv) != 3: @@ -16,4 +16,4 @@ def main(argv=sys.argv): with open(pickle_target_file, 'wb') as f: p = Pickler(f, protocol=4) - ctf_to_pickle(trace_directory, p) + ctf.ctf_to_pickle(trace_directory, p) diff --git a/tracetools_analysis/process.py b/tracetools_analysis/process.py index 76d04a5..546c1ec 100644 --- a/tracetools_analysis/process.py +++ b/tracetools_analysis/process.py @@ -4,8 +4,7 @@ import sys import pickle import pandas as pd -from tracetools_analysis.analysis.ros_processor import * -from tracetools_analysis.analysis.to_pandas import * +from tracetools_analysis.analysis import ros_processor, to_pandas def main(argv=sys.argv): if len(argv) != 2: @@ -16,9 +15,9 @@ def main(argv=sys.argv): with open(pickle_filename, 'rb') as f: events = _get_events_from_pickled_file(f) print(f'imported {len(events)} events') - processor = ros_process(events) + processor = ros_processor.ros_process(events) - df = callback_durations_to_df(processor) + df = to_pandas.callback_durations_to_df(processor) print(df.to_string())