Skip to content

Commit

Permalink
python: futurize -f lib2to3.fixes.fix_numliterals
Browse files Browse the repository at this point in the history
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

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180608122952.2009-11-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
  • Loading branch information
ehabkost committed Jun 8, 2018
1 parent bd22808 commit 4803c5c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions scripts/qmp/qom-fuse
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
24 changes: 12 additions & 12 deletions tests/qemu-iotests/118
Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down Expand Up @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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()
Expand Down

0 comments on commit 4803c5c

Please sign in to comment.