From 8c77b3bbb4658552fd904e43c2ad72df1060af2e Mon Sep 17 00:00:00 2001 From: Christophe Bedard Date: Sun, 13 Oct 2019 16:10:49 -0700 Subject: [PATCH] Use os.path.expanduser() in load_file --- tracetools_analysis/analysis/callback_duration.ipynb | 2 -- tracetools_analysis/tracetools_analysis/loading/__init__.py | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tracetools_analysis/analysis/callback_duration.ipynb b/tracetools_analysis/analysis/callback_duration.ipynb index faac368..9b10a7e 100644 --- a/tracetools_analysis/analysis/callback_duration.ipynb +++ b/tracetools_analysis/analysis/callback_duration.ipynb @@ -44,7 +44,6 @@ "sys.path.insert(0, '../')\n", "sys.path.insert(0, '../../../micro-ROS/ros_tracing/ros2_tracing/tracetools_read/')\n", "import datetime as dt\n", - "import os\n", "\n", "from bokeh.plotting import figure\n", "from bokeh.plotting import output_notebook\n", @@ -68,7 +67,6 @@ "outputs": [], "source": [ "# Process\n", - "converted_file_path = os.path.expanduser(converted_file_path)\n", "events = load_file(converted_file_path)\n", "handler = Ros2Handler.process(events)\n", "#handler.data.print_model()" diff --git a/tracetools_analysis/tracetools_analysis/loading/__init__.py b/tracetools_analysis/tracetools_analysis/loading/__init__.py index 0347e7e..96abc39 100644 --- a/tracetools_analysis/tracetools_analysis/loading/__init__.py +++ b/tracetools_analysis/tracetools_analysis/loading/__init__.py @@ -14,6 +14,7 @@ """Module for converted trace file loading.""" +import os import pickle from typing import Dict from typing import List @@ -27,7 +28,7 @@ def load_file(file_path: str) -> List[Dict]: :return: the list of events read from the file """ events = [] - with open(file_path, 'rb') as f: + with open(os.path.expanduser(file_path), 'rb') as f: p = pickle.Unpickler(f) while True: try: