2018-05-22 08:46:20

by Vitaly Kuznetsov

Subject: [PATCH] tools: hv: lsvmbus: convert to Python3

Use '2to3' tool to make lsvmbus work with both Python2 and Python3.

Signed-off-by: Vitaly Kuznetsov <[email protected]>
---
tools/hv/lsvmbus | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/hv/lsvmbus b/tools/hv/lsvmbus
index 353e56768df8..c184aac33d5c 100644
--- a/tools/hv/lsvmbus
+++ b/tools/hv/lsvmbus
@@ -17,7 +17,7 @@ if options.verbose is not None:

vmbus_sys_path = '/sys/bus/vmbus/devices'
if not os.path.isdir(vmbus_sys_path):
- print "%s doesn't exist: exiting..." % vmbus_sys_path
+ print("%s doesn't exist: exiting..." % vmbus_sys_path)
exit(-1)

vmbus_dev_dict = {
@@ -93,11 +93,11 @@ format2 = '%2s: Class_ID = %s - %s\n\tDevice_ID = %s\n\tSysfs path: %s\n%s'

for d in vmbus_dev_list:
if verbose == 0:
- print ('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc)
+ print(('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc))
elif verbose == 1:
- print ('VMBUS ID ' + format1) % \
- (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping)
+ print(('VMBUS ID ' + format1) % \
+ (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping))
else:
- print ('VMBUS ID ' + format2) % \
+ print(('VMBUS ID ' + format2) % \
(d.vmbus_id, d.class_id, d.dev_desc, \
- d.device_id, d.sysfs_path, d.chn_vp_mapping)
+ d.device_id, d.sysfs_path, d.chn_vp_mapping))
--
2.14.3

2018-05-22 18:31:28

by Dexuan Cui

Subject: RE: [PATCH] tools: hv: lsvmbus: convert to Python3

> From: Vitaly Kuznetsov <[email protected]>
> Sent: Tuesday, May 22, 2018 01:45
>
> Use '2to3' tool to make lsvmbus work with both Python2 and Python3.
>
> Signed-off-by: Vitaly Kuznetsov <[email protected]>
> ---
> tools/hv/lsvmbus | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tools/hv/lsvmbus b/tools/hv/lsvmbus
> index 353e56768df8..c184aac33d5c 100644
> --- a/tools/hv/lsvmbus
> +++ b/tools/hv/lsvmbus
> @@ -17,7 +17,7 @@ if options.verbose is not None:
>
> vmbus_sys_path = '/sys/bus/vmbus/devices'
> if not os.path.isdir(vmbus_sys_path):
> - print "%s doesn't exist: exiting..." % vmbus_sys_path
> + print("%s doesn't exist: exiting..." % vmbus_sys_path)
> exit(-1)
>
> vmbus_dev_dict = {
> @@ -93,11 +93,11 @@ format2 = '%2s: Class_ID = %s - %s\n\tDevice_ID
> = %s\n\tSysfs path: %s\n%s'
>
> for d in vmbus_dev_list:
> if verbose == 0:
> - print ('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc)
> + print(('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc))
> elif verbose == 1:
> - print ('VMBUS ID ' + format1) % \
> - (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping)
> + print(('VMBUS ID ' + format1) % \
> + (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping))
> else:
> - print ('VMBUS ID ' + format2) % \
> + print(('VMBUS ID ' + format2) % \
> (d.vmbus_id, d.class_id, d.dev_desc, \
> - d.device_id, d.sysfs_path, d.chn_vp_mapping)
> + d.device_id, d.sysfs_path, d.chn_vp_mapping))
> --
> 2.14.3

Looks good to me. Thanks!

Acked-by: Dexuan Cui <[email protected]>