On 05/11/2018 07:20 PM, Eduardo Habkost wrote: > Convert octal literals into the new syntax. > > This is necessary for Python 3 compatibility. > > Done using: > > $ py=$( (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 > > Signed-off-by: Eduardo Habkost <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]> > --- > 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): > > def getattr(self, path): > if self.is_link(path): > - value = posix.stat_result((0755 | stat.S_IFLNK, > + value = 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 = posix.stat_result((0755 | stat.S_IFDIR, > + value = 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 = posix.stat_result((0644 | stat.S_IFREG, > + value = 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): > > 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) > > 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=disk,read-only=on', 'none') > self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name) > self.vm.launch() > @@ -417,7 +417,7 @@ class TestChangeReadOnly(ChangeBaseClass): > self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img) > > def test_ro_rw_retain(self): > - os.chmod(old_img, 0444) > + os.chmod(old_img, 0o444) > self.vm.add_drive(old_img, 'media=disk,read-only=on', 'none') > self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name) > self.vm.launch() > @@ -437,7 +437,7 @@ class TestChangeReadOnly(ChangeBaseClass): > self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img) > > def test_rw_ro_retain(self): > - os.chmod(new_img, 0444) > + os.chmod(new_img, 0o444) > self.vm.add_drive(old_img, 'media=disk', 'none') > self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name) > self.vm.launch() > @@ -459,7 +459,7 @@ class TestChangeReadOnly(ChangeBaseClass): > self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img) > > def test_ro_rw(self): > - os.chmod(old_img, 0444) > + os.chmod(old_img, 0o444) > self.vm.add_drive(old_img, 'media=disk,read-only=on', 'none') > self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name) > self.vm.launch() > @@ -480,7 +480,7 @@ class TestChangeReadOnly(ChangeBaseClass): > self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img) > > def test_rw_ro(self): > - os.chmod(new_img, 0444) > + os.chmod(new_img, 0o444) > self.vm.add_drive(old_img, 'media=disk', 'none') > self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name) > self.vm.launch() > @@ -521,7 +521,7 @@ class TestChangeReadOnly(ChangeBaseClass): > self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img) > > def test_make_ro_rw(self): > - os.chmod(new_img, 0444) > + os.chmod(new_img, 0o444) > self.vm.add_drive(old_img, 'media=disk', 'none') > self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name) > self.vm.launch() > @@ -542,7 +542,7 @@ class TestChangeReadOnly(ChangeBaseClass): > self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img) > > 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=disk,read-only=on', 'none') > self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name) > self.vm.launch() > @@ -562,7 +562,7 @@ class TestChangeReadOnly(ChangeBaseClass): > self.assert_qmp(result, 'return[0]/inserted/image/filename', new_img) > > 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=disk', 'none') > self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name) > self.vm.launch() > @@ -582,7 +582,7 @@ class TestChangeReadOnly(ChangeBaseClass): > self.assert_qmp(result, 'return[0]/inserted/image/filename', old_img) > > def test_rw_ro_cycle(self): > - os.chmod(new_img, 0444) > + os.chmod(new_img, 0o444) > self.vm.add_drive(old_img, 'media=disk', 'none') > self.vm.add_device('floppy,drive=drive0,id=%s' % self.device_name) > self.vm.launch() >
