[v1] Tracing patches

[PULL 2/8] tracetool: apply isort and add check
Posted by Stefan Hajnoczi 2 weeks, 6 days ago
From: Paolo Bonzini <pbonzini@redhat.com>

Sort imports automatically, to keep the coding style more uniform.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20251008063546.376603-3-pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 python/tests/tracetool-isort.sh      | 4 ++++
 scripts/tracetool.py                 | 5 ++---
 scripts/tracetool/backend/dtrace.py  | 1 -
 scripts/tracetool/backend/ftrace.py  | 3 +--
 scripts/tracetool/backend/log.py     | 3 +--
 scripts/tracetool/backend/simple.py  | 1 -
 scripts/tracetool/backend/syslog.py  | 3 +--
 scripts/tracetool/backend/ust.py     | 1 -
 scripts/tracetool/format/d.py        | 2 +-
 scripts/tracetool/format/log_stap.py | 1 -
 scripts/tracetool/format/stap.py     | 1 -
 11 files changed, 10 insertions(+), 15 deletions(-)
 create mode 100755 python/tests/tracetool-isort.sh

diff --git a/python/tests/tracetool-isort.sh b/python/tests/tracetool-isort.sh
new file mode 100755
index 0000000000..b23f3d4844
--- /dev/null
+++ b/python/tests/tracetool-isort.sh
@@ -0,0 +1,4 @@
+#!/bin/sh -e
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+python3 -m isort --sp . -c ../scripts/tracetool/
diff --git a/scripts/tracetool.py b/scripts/tracetool.py
index 0fdc9cb947..22fdc29e01 100755
--- a/scripts/tracetool.py
+++ b/scripts/tracetool.py
@@ -12,13 +12,12 @@
 __email__      = "stefanha@redhat.com"
 
 
-import sys
 import getopt
+import sys
 
-from tracetool import error_write, out, out_open
 import tracetool.backend
 import tracetool.format
-
+from tracetool import error_write, out, out_open
 
 _SCRIPT = ""
 
diff --git a/scripts/tracetool/backend/dtrace.py b/scripts/tracetool/backend/dtrace.py
index f0b58cc158..5f313ddaed 100644
--- a/scripts/tracetool/backend/dtrace.py
+++ b/scripts/tracetool/backend/dtrace.py
@@ -14,7 +14,6 @@
 
 from tracetool import out
 
-
 PUBLIC = True
 
 
diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backend/ftrace.py
index e03698a2ed..0d77bd23a5 100644
--- a/scripts/tracetool/backend/ftrace.py
+++ b/scripts/tracetool/backend/ftrace.py
@@ -12,8 +12,7 @@
 __email__      = "stefanha@redhat.com"
 
 
-from tracetool import out, expand_format_string
-
+from tracetool import expand_format_string, out
 
 PUBLIC = True
 CHECK_TRACE_EVENT_GET_STATE = True
diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py
index 9e3e5046f5..bbfb56911d 100644
--- a/scripts/tracetool/backend/log.py
+++ b/scripts/tracetool/backend/log.py
@@ -12,8 +12,7 @@
 __email__      = "stefanha@redhat.com"
 
 
-from tracetool import out, expand_format_string
-
+from tracetool import expand_format_string, out
 
 PUBLIC = True
 CHECK_TRACE_EVENT_GET_STATE = True
diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backend/simple.py
index b131e4fc19..b67257ce7e 100644
--- a/scripts/tracetool/backend/simple.py
+++ b/scripts/tracetool/backend/simple.py
@@ -14,7 +14,6 @@
 
 from tracetool import out
 
-
 PUBLIC = True
 CHECK_TRACE_EVENT_GET_STATE = True
 
diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py
index 12b826593d..c3efab036c 100644
--- a/scripts/tracetool/backend/syslog.py
+++ b/scripts/tracetool/backend/syslog.py
@@ -12,8 +12,7 @@
 __email__      = "stefanha@redhat.com"
 
 
-from tracetool import out, expand_format_string
-
+from tracetool import expand_format_string, out
 
 PUBLIC = True
 CHECK_TRACE_EVENT_GET_STATE = True
diff --git a/scripts/tracetool/backend/ust.py b/scripts/tracetool/backend/ust.py
index 3aa9bb1da2..a70e3d83e1 100644
--- a/scripts/tracetool/backend/ust.py
+++ b/scripts/tracetool/backend/ust.py
@@ -14,7 +14,6 @@
 
 from tracetool import out
 
-
 PUBLIC = True
 
 
diff --git a/scripts/tracetool/format/d.py b/scripts/tracetool/format/d.py
index e9e33dfe30..0befd444e8 100644
--- a/scripts/tracetool/format/d.py
+++ b/scripts/tracetool/format/d.py
@@ -12,9 +12,9 @@
 __email__      = "stefanha@redhat.com"
 
 
-from tracetool import out
 from sys import platform
 
+from tracetool import out
 
 # Reserved keywords from
 # https://wikis.oracle.com/display/DTrace/Types,+Operators+and+Expressions
diff --git a/scripts/tracetool/format/log_stap.py b/scripts/tracetool/format/log_stap.py
index 259303a189..99c6181f38 100644
--- a/scripts/tracetool/format/log_stap.py
+++ b/scripts/tracetool/format/log_stap.py
@@ -18,7 +18,6 @@
 from tracetool.backend.simple import is_string
 from tracetool.format.stap import stap_escape
 
-
 STATE_SKIP = 0
 STATE_LITERAL = 1
 STATE_MACRO = 2
diff --git a/scripts/tracetool/format/stap.py b/scripts/tracetool/format/stap.py
index 285c9203ba..f917bd7545 100644
--- a/scripts/tracetool/format/stap.py
+++ b/scripts/tracetool/format/stap.py
@@ -15,7 +15,6 @@
 from tracetool import out
 from tracetool.backend.dtrace import binary, probeprefix
 
-
 # Technically 'self' is not used by systemtap yet, but
 # they recommended we keep it in the reserved list anyway
 RESERVED_WORDS = (
-- 
2.52.0