[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/15] scripts/qom-fuse: Apply pylint rules
From: |
John Snow |
Subject: |
[PATCH 07/15] scripts/qom-fuse: Apply pylint rules |
Date: |
Wed, 21 Oct 2020 14:52:00 -0400 |
- Catch specific exceptions from QMP
- Reraise errors with explicit context
- method parameters should match parent's names
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qmp/qom-fuse | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse
index ca30e92867..805e99c8ec 100755
--- a/scripts/qmp/qom-fuse
+++ b/scripts/qmp/qom-fuse
@@ -23,7 +23,7 @@ from fuse import FUSE, FuseOSError, Operations
sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
-from qemu.qmp import QEMUMonitorProtocol
+from qemu.qmp import QEMUMonitorProtocol, QMPResponseError
fuse.fuse_python_api = (0, 2)
@@ -47,7 +47,7 @@ class QOMFS(Operations):
try:
self.qmp.command('qom-list', path=path)
return True
- except:
+ except QMPResponseError:
return False
def is_property(self, path):
@@ -59,7 +59,7 @@ class QOMFS(Operations):
if item['name'] == prop:
return True
return False
- except:
+ except QMPResponseError:
return False
def is_link(self, path):
@@ -73,10 +73,10 @@ class QOMFS(Operations):
return True
return False
return False
- except:
+ except QMPResponseError:
return False
- def read(self, path, length, offset, fh):
+ def read(self, path, size, offset, fh):
if not self.is_property(path):
return -ENOENT
@@ -86,13 +86,13 @@ class QOMFS(Operations):
try:
data = self.qmp.command('qom-get', path=path, property=prop)
data += '\n' # make values shell friendly
- except:
- raise FuseOSError(EPERM)
+ except QMPResponseError as err:
+ raise FuseOSError(EPERM) from err
if offset > len(data):
return ''
- return bytes(data[offset:][:length], encoding='utf-8')
+ return bytes(data[offset:][:size], encoding='utf-8')
def readlink(self, path):
if not self.is_link(path):
--
2.26.2
- [PATCH 00/15] python: absorb scripts/qmp/qom-* tooling, John Snow, 2020/10/21
- [PATCH 03/15] scripts/qmp: redirect qom-xxx scripts to python/qemu/qmp/, John Snow, 2020/10/21
- [PATCH 10/15] scripts/qom-fuse: use QOMCommand.qom_list(), John Snow, 2020/10/21
- [PATCH 13/15] scripts/qom-fuse: move to python/qemu/qmp/qom_fuse.py, John Snow, 2020/10/21
- [PATCH 08/15] scripts/qom-fuse: Add docstrings, John Snow, 2020/10/21
- [PATCH 07/15] scripts/qom-fuse: Apply pylint rules,
John Snow <=
- [PATCH 12/15] scripts/qom-fuse: add static type hints, John Snow, 2020/10/21
- [PATCH 11/15] scripts/qom-fuse: ensure QOMFuse.read always returns bytes, John Snow, 2020/10/21
- [PATCH 06/15] python: Add 'fh' to known-good variable names, John Snow, 2020/10/21
- [PATCH 01/15] python/qmp: Add qom script rewrites, John Snow, 2020/10/21
- [PATCH 02/15] python/qmp: add qom script entry points, John Snow, 2020/10/21
- [PATCH 04/15] scripts/qom-fuse: apply isort rules, John Snow, 2020/10/21