From nobody Mon Nov 3 06:16:16 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1528461886008434.172487067268; Fri, 8 Jun 2018 05:44:46 -0700 (PDT) Received: from localhost ([::1]:35408 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGl3-0001iH-5q for importer@patchew.org; Fri, 08 Jun 2018 08:44:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGYR-0008R8-Cl for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:31:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRGYQ-0005Sh-9W for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:31:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53174) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fRGYN-0005Qz-DX; Fri, 08 Jun 2018 08:31:39 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9CBB381101; Fri, 8 Jun 2018 12:31:38 +0000 (UTC) Received: from localhost (ovpn-116-19.gru2.redhat.com [10.97.116.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id 112855C8B9; Fri, 8 Jun 2018 12:31:37 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 8 Jun 2018 09:29:52 -0300 Message-Id: <20180608122952.2009-11-ehabkost@redhat.com> In-Reply-To: <20180608122952.2009-1-ehabkost@redhat.com> References: <20180608122952.2009-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 08 Jun 2018 12:31:38 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 10/10] python: futurize -f lib2to3.fixes.fix_numliterals X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , Eduardo Habkost , qemu-block@nongnu.org, Juan Quintela , Markus Armbruster , "Dr. David Alan Gilbert" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Cleber Rosa , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Max Reitz , =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Convert octal literals into the new syntax. This is necessary for Python 3 compatibility. Done using: $ py=3D$( (g grep -l -E '^#!.*python';find -name '*.py' -printf '%P\n';) = | \ sort -u | grep -v README.sh4) $ futurize -w -f lib2to3.fixes.fix_numliterals $py Reviewed-by: Stefan Hajnoczi Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Eduardo Habkost --- scripts/qmp/qom-fuse | 6 +++--- tests/qemu-iotests/118 | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse index b00cb0a0af..e524e798fc 100755 --- a/scripts/qmp/qom-fuse +++ b/scripts/qmp/qom-fuse @@ -90,7 +90,7 @@ class QOMFS(Fuse): =20 def getattr(self, path): if self.is_link(path): - value =3D posix.stat_result((0755 | stat.S_IFLNK, + value =3D posix.stat_result((0o755 | stat.S_IFLNK, self.get_ino(path), 0, 2, @@ -101,7 +101,7 @@ class QOMFS(Fuse): 0, 0)) elif self.is_object(path): - value =3D posix.stat_result((0755 | stat.S_IFDIR, + value =3D posix.stat_result((0o755 | stat.S_IFDIR, self.get_ino(path), 0, 2, @@ -112,7 +112,7 @@ class QOMFS(Fuse): 0, 0)) elif self.is_property(path): - value =3D posix.stat_result((0644 | stat.S_IFREG, + value =3D posix.stat_result((0o644 | stat.S_IFREG, self.get_ino(path), 0, 1, diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118 index a0469b570e..ff3b2ae3e7 100755 --- a/tests/qemu-iotests/118 +++ b/tests/qemu-iotests/118 @@ -390,14 +390,14 @@ class TestChangeReadOnly(ChangeBaseClass): =20 def tearDown(self): self.vm.shutdown() - os.chmod(old_img, 0666) - os.chmod(new_img, 0666) + os.chmod(old_img, 0o666) + os.chmod(new_img, 0o666) os.remove(old_img) os.remove(new_img) =20 def test_ro_ro_retain(self): - os.chmod(old_img, 0444) - os.chmod(new_img, 0444) + os.chmod(old_img, 0o444) + os.chmod(new_img, 0o444) self.vm.add_drive(old_img, 'media=3Ddisk,read-only=3Don', 'none') self.vm.add_device('floppy,drive=3Ddrive0,id=3D%s' % self.device_n= ame) self.vm.launch() @@ -417,7 +417,7 @@ class TestChangeReadOnly(ChangeBaseClass): self.assert_qmp(result, 'return[0]/inserted/image/filename', new_i= mg) =20 def test_ro_rw_retain(self): - os.chmod(old_img, 0444) + os.chmod(old_img, 0o444) self.vm.add_drive(old_img, 'media=3Ddisk,read-only=3Don', 'none') self.vm.add_device('floppy,drive=3Ddrive0,id=3D%s' % self.device_n= ame) self.vm.launch() @@ -437,7 +437,7 @@ class TestChangeReadOnly(ChangeBaseClass): self.assert_qmp(result, 'return[0]/inserted/image/filename', new_i= mg) =20 def test_rw_ro_retain(self): - os.chmod(new_img, 0444) + os.chmod(new_img, 0o444) self.vm.add_drive(old_img, 'media=3Ddisk', 'none') self.vm.add_device('floppy,drive=3Ddrive0,id=3D%s' % self.device_n= ame) self.vm.launch() @@ -459,7 +459,7 @@ class TestChangeReadOnly(ChangeBaseClass): self.assert_qmp(result, 'return[0]/inserted/image/filename', old_i= mg) =20 def test_ro_rw(self): - os.chmod(old_img, 0444) + os.chmod(old_img, 0o444) self.vm.add_drive(old_img, 'media=3Ddisk,read-only=3Don', 'none') self.vm.add_device('floppy,drive=3Ddrive0,id=3D%s' % self.device_n= ame) self.vm.launch() @@ -480,7 +480,7 @@ class TestChangeReadOnly(ChangeBaseClass): self.assert_qmp(result, 'return[0]/inserted/image/filename', new_i= mg) =20 def test_rw_ro(self): - os.chmod(new_img, 0444) + os.chmod(new_img, 0o444) self.vm.add_drive(old_img, 'media=3Ddisk', 'none') self.vm.add_device('floppy,drive=3Ddrive0,id=3D%s' % self.device_n= ame) self.vm.launch() @@ -521,7 +521,7 @@ class TestChangeReadOnly(ChangeBaseClass): self.assert_qmp(result, 'return[0]/inserted/image/filename', new_i= mg) =20 def test_make_ro_rw(self): - os.chmod(new_img, 0444) + os.chmod(new_img, 0o444) self.vm.add_drive(old_img, 'media=3Ddisk', 'none') self.vm.add_device('floppy,drive=3Ddrive0,id=3D%s' % self.device_n= ame) self.vm.launch() @@ -542,7 +542,7 @@ class TestChangeReadOnly(ChangeBaseClass): self.assert_qmp(result, 'return[0]/inserted/image/filename', old_i= mg) =20 def test_make_rw_ro_by_retain(self): - os.chmod(old_img, 0444) + os.chmod(old_img, 0o444) self.vm.add_drive(old_img, 'media=3Ddisk,read-only=3Don', 'none') self.vm.add_device('floppy,drive=3Ddrive0,id=3D%s' % self.device_n= ame) self.vm.launch() @@ -562,7 +562,7 @@ class TestChangeReadOnly(ChangeBaseClass): self.assert_qmp(result, 'return[0]/inserted/image/filename', new_i= mg) =20 def test_make_ro_rw_by_retain(self): - os.chmod(new_img, 0444) + os.chmod(new_img, 0o444) self.vm.add_drive(old_img, 'media=3Ddisk', 'none') self.vm.add_device('floppy,drive=3Ddrive0,id=3D%s' % self.device_n= ame) self.vm.launch() @@ -582,7 +582,7 @@ class TestChangeReadOnly(ChangeBaseClass): self.assert_qmp(result, 'return[0]/inserted/image/filename', old_i= mg) =20 def test_rw_ro_cycle(self): - os.chmod(new_img, 0444) + os.chmod(new_img, 0o444) self.vm.add_drive(old_img, 'media=3Ddisk', 'none') self.vm.add_device('floppy,drive=3Ddrive0,id=3D%s' % self.device_n= ame) self.vm.launch() --=20 2.18.0.rc1.1.g3f1ff2140