From nobody Wed May 14 19:36:38 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1520966729574128.02306617518457; Tue, 13 Mar 2018 11:45:29 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 50CFB68D4; Tue, 13 Mar 2018 18:45:28 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 190AF60BEB; Tue, 13 Mar 2018 18:45:28 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CC887180215E; Tue, 13 Mar 2018 18:45:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2DIgskK020529 for ; Tue, 13 Mar 2018 14:42:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id 54881202322A; Tue, 13 Mar 2018 18:42:54 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EFF962024CAB for ; Tue, 13 Mar 2018 18:42:53 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Tue, 13 Mar 2018 19:42:45 +0100 Message-Id: <20180313184247.29212-4-abologna@redhat.com> In-Reply-To: <20180313184247.29212-1-abologna@redhat.com> References: <20180313184247.29212-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [RFC PATCH 3/5] esx: Port esx_vi_generator.py to Python 3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 13 Mar 2018 18:45:28 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Very few tweaks needed. The generated files are bit by bit identical to those produced before, regardless of whether the script is invoked using Python 2 or Python 3. Signed-off-by: Andrea Bolognani --- src/esx/esx_vi_generator.py | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index a2b8bef721..176db8449d 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -22,6 +22,8 @@ # . # =20 +from __future__ import print_function + import sys import os import os.path @@ -1196,7 +1198,7 @@ class Enum(Type): =20 =20 def report_error(message): - print "error: " + message + print("error: " + message) sys.exit(1) =20 =20 @@ -1321,11 +1323,11 @@ def is_known_type(type): =20 def open_and_print(filename): if filename.startswith("./"): - print " GEN " + filename[2:] + print(" GEN " + filename[2:]) else: - print " GEN " + filename + print(" GEN " + filename) =20 - return open(filename, "wb") + return open(filename, "wt") =20 =20 =20 @@ -1433,7 +1435,7 @@ block =3D None =20 =20 # parse input file -for line in file(input_filename, "rb").readlines(): +for line in open(input_filename, "rt").readlines(): number +=3D 1 =20 if "#" in line: @@ -1702,8 +1704,7 @@ types_typedef.write(separator + " * VI Enums\n" + " */\n\n") =20 -names =3D enums_by_name.keys() -names.sort() +names =3D sorted(enums_by_name.keys()) =20 for name in names: types_typedef.write(enums_by_name[name].generate_typedef()) @@ -1724,8 +1725,7 @@ types_typeenum.write("\n") types_typetostring.write("\n") types_typefromstring.write("\n") =20 -names =3D objects_by_name.keys() -names.sort() +names =3D sorted(objects_by_name.keys()) =20 for name in names: types_typedef.write(objects_by_name[name].generate_typedef()) @@ -1746,8 +1746,7 @@ types_typeenum.write("\n") types_typetostring.write("\n") types_typefromstring.write("\n") =20 -names =3D managed_objects_by_name.keys() -names.sort() +names =3D sorted(managed_objects_by_name.keys()) =20 for name in names: types_typedef.write(managed_objects_by_name[name].generate_typedef()) @@ -1760,15 +1759,13 @@ for name in names: =20 =20 # output methods -names =3D methods_by_name.keys() -names.sort() +names =3D sorted(methods_by_name.keys()) =20 for name in names: methods_header.write(methods_by_name[name].generate_header()) methods_source.write(methods_by_name[name].generate_source()) =20 -names =3D list(autobind_names) -names.sort() +names =3D sorted(list(autobind_names)) =20 for name in names: string =3D aligned("#define ESX_VI__METHOD__PARAMETER__THIS__%s " % na= me, "\\\n", 78) @@ -1780,8 +1777,7 @@ for name in names: =20 =20 # output helpers -names =3D managed_objects_by_name.keys() -names.sort() +names =3D sorted(managed_objects_by_name.keys()) =20 for name in names: helpers_header.write(managed_objects_by_name[name].generate_helper_hea= der()) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list