From e5b8d1782f46dca1e04c3440c74e6158a1dcb385 Mon Sep 17 00:00:00 2001
From: Christophe Bedard <fixed-term.christophe.bourquebedard@de.bosch.com>
Date: Fri, 7 Jun 2019 11:05:20 +0200
Subject: [PATCH] Fix lint errors in tracetools_analysis

---
 tracetools_analysis/analysis/handler.py       | 1 +
 tracetools_analysis/analysis/lttng_models.py  | 4 ++++
 tracetools_analysis/analysis/ros_processor.py | 4 ++--
 tracetools_analysis/analysis/to_pandas.py     | 2 +-
 tracetools_analysis/conversion/ctf.py         | 5 +++--
 tracetools_analysis/convert.py                | 6 ++++--
 tracetools_analysis/process.py                | 9 +++++----
 7 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/tracetools_analysis/analysis/handler.py b/tracetools_analysis/analysis/handler.py
index 4b5412d..1308d1e 100644
--- a/tracetools_analysis/analysis/handler.py
+++ b/tracetools_analysis/analysis/handler.py
@@ -1,6 +1,7 @@
 # Event handler
 
 import sys
+
 from . import lttng_models
 
 
diff --git a/tracetools_analysis/analysis/lttng_models.py b/tracetools_analysis/analysis/lttng_models.py
index 88f7e01..d0cb096 100644
--- a/tracetools_analysis/analysis/lttng_models.py
+++ b/tracetools_analysis/analysis/lttng_models.py
@@ -1,13 +1,17 @@
 # Model objects for LTTng traces/events
 
+
 def get_field(event, field_name, default=None):
     return event.get(field_name, default)
 
+
 def get_name(event):
     return get_field(event, '_name')
 
 
 class EventMetadata():
+    """Container for event metadata."""
+
     def __init__(self, event_name, pid, tid, timestamp, procname):
         self._event_name = event_name
         self._pid = pid
diff --git a/tracetools_analysis/analysis/ros_processor.py b/tracetools_analysis/analysis/ros_processor.py
index abfe5bc..7c75e37 100644
--- a/tracetools_analysis/analysis/ros_processor.py
+++ b/tracetools_analysis/analysis/ros_processor.py
@@ -1,8 +1,8 @@
 # Process trace events and create ROS model
 
-import sys
-from .lttng_models import get_field
 from .handler import EventHandler
+from .lttng_models import get_field
+
 
 def ros_process(events):
     """
diff --git a/tracetools_analysis/analysis/to_pandas.py b/tracetools_analysis/analysis/to_pandas.py
index 2496913..cbdb224 100644
--- a/tracetools_analysis/analysis/to_pandas.py
+++ b/tracetools_analysis/analysis/to_pandas.py
@@ -1,7 +1,7 @@
 # Convert processor object to pandas dataframe
 
 import pandas as pd
-from .ros_processor import RosProcessor
+
 
 def callback_durations_to_df(ros_processor):
     callback_addresses = []
diff --git a/tracetools_analysis/conversion/ctf.py b/tracetools_analysis/conversion/ctf.py
index fd4c28f..741e21c 100644
--- a/tracetools_analysis/conversion/ctf.py
+++ b/tracetools_analysis/conversion/ctf.py
@@ -1,9 +1,9 @@
 # CTF to pickle conversion
 
-import babeltrace
-from pickle import Pickler
 import time
 
+import babeltrace
+
 # List of ignored CTF fields
 _IGNORED_FIELDS = [
     'content_size', 'cpu_id', 'events_discarded', 'id', 'packet_size', 'packet_seq_num',
@@ -11,6 +11,7 @@ _IGNORED_FIELDS = [
 ]
 _DISCARD = 'events_discarded'
 
+
 def ctf_to_pickle(trace_directory, target):
     """
     Load CTF trace and convert to a pickle file.
diff --git a/tracetools_analysis/convert.py b/tracetools_analysis/convert.py
index 049bd16..d3539cc 100644
--- a/tracetools_analysis/convert.py
+++ b/tracetools_analysis/convert.py
@@ -2,13 +2,15 @@
 # Entrypoint/script to convert CTF trace data to a pickle file
 # TODO
 
-import sys
 from pickle import Pickler
+import sys
+
 from tracetools_analysis.conversion import ctf
 
+
 def main(argv=sys.argv):
     if len(argv) != 3:
-        print("usage: /trace/directory pickle_target_file")
+        print('usage: /trace/directory pickle_target_file')
         exit(1)
 
     trace_directory = sys.argv[1]
diff --git a/tracetools_analysis/process.py b/tracetools_analysis/process.py
index 546c1ec..6335e53 100644
--- a/tracetools_analysis/process.py
+++ b/tracetools_analysis/process.py
@@ -1,16 +1,17 @@
 #!/usr/bin/env python3
 # Entrypoint/script to process events from a pickle file to build a ROS model
 
-import sys
 import pickle
-import pandas as pd
+import sys
+
 from tracetools_analysis.analysis import ros_processor, to_pandas
 
+
 def main(argv=sys.argv):
     if len(argv) != 2:
         print('usage: pickle_file')
         exit(1)
-    
+
     pickle_filename = sys.argv[1]
     with open(pickle_filename, 'rb') as f:
         events = _get_events_from_pickled_file(f)
@@ -27,6 +28,6 @@ def _get_events_from_pickled_file(file):
     while True:
         try:
             events.append(p.load())
-        except EOFError as _:
+        except EOFError:
             break  # we're done
     return events