Mailing List Archive

[xen stable-4.17] tools/xenmon: Fix xenmon.py for with python3.x
commit 244d39fb13abae6c2da341b76363f169d8bbc93b
Author: Bernhard Kaindl <bernhard.kaindl@citrix.com>
AuthorDate: Tue Mar 21 13:44:04 2023 +0100
Commit: Jan Beulich <jbeulich@suse.com>
CommitDate: Tue Mar 21 13:44:04 2023 +0100

tools/xenmon: Fix xenmon.py for with python3.x

Fixes for Py3:
* class Delayed(): file not defined; also an error for pylint -E. Inherit
object instead for Py2 compatibility. Fix DomainInfo() too.
* Inconsistent use of tabs and spaces for indentation (in one block)

Signed-off-by: Bernhard Kaindl <bernhard.kaindl@citrix.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
master commit: 3a59443c1d5ae0677a792c660ccd3796ce036732
master date: 2023-02-06 10:22:12 +0000
---
tools/xenmon/xenmon.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/xenmon/xenmon.py b/tools/xenmon/xenmon.py
index 175eacd2cb..977ada6887 100644
--- a/tools/xenmon/xenmon.py
+++ b/tools/xenmon/xenmon.py
@@ -117,7 +117,7 @@ def setup_cmdline_parser():
return parser

# encapsulate information about a domain
-class DomainInfo:
+class DomainInfo(object):
def __init__(self):
self.allocated_sum = 0
self.gotten_sum = 0
@@ -533,7 +533,7 @@ def show_livestats(cpu):
# simple functions to allow initialization of log files without actually
# physically creating files that are never used; only on the first real
# write does the file get created
-class Delayed(file):
+class Delayed(object):
def __init__(self, filename, mode):
self.filename = filename
self.saved_mode = mode
@@ -677,8 +677,8 @@ def main():

if os.uname()[0] == "SunOS":
xenbaked_cmd = "/usr/lib/xenbaked"
- stop_cmd = "/usr/bin/pkill -INT -z global xenbaked"
- kill_cmd = "/usr/bin/pkill -KILL -z global xenbaked"
+ stop_cmd = "/usr/bin/pkill -INT -z global xenbaked"
+ kill_cmd = "/usr/bin/pkill -KILL -z global xenbaked"
else:
# assumes that xenbaked is in your path
xenbaked_cmd = "xenbaked"
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.17