[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 17/19] scripts/qom-fuse: move to python/qemu/qmp/qom_fuse.py
From: |
John Snow |
Subject: |
[PATCH v3 17/19] scripts/qom-fuse: move to python/qemu/qmp/qom_fuse.py |
Date: |
Wed, 2 Jun 2021 20:37:17 -0400 |
Move qom-fuse over to the python package now that it passes the
linter. Update the import paradigms so that it continues to pass in the
context of the Python package.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qmp/qom-fuse => python/qemu/qmp/qom_fuse.py | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
rename scripts/qmp/qom-fuse => python/qemu/qmp/qom_fuse.py (95%)
mode change 100755 => 100644
diff --git a/scripts/qmp/qom-fuse b/python/qemu/qmp/qom_fuse.py
old mode 100755
new mode 100644
similarity index 95%
rename from scripts/qmp/qom-fuse
rename to python/qemu/qmp/qom_fuse.py
index a5a7a304a3e..43f4671fdb1
--- a/scripts/qmp/qom-fuse
+++ b/python/qemu/qmp/qom_fuse.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
"""
QEMU Object Model FUSE filesystem tool
@@ -35,7 +34,6 @@
import argparse
from errno import ENOENT, EPERM
-import os
import stat
import sys
from typing import (
@@ -50,10 +48,8 @@
import fuse
from fuse import FUSE, FuseOSError, Operations
-
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
-from qemu.qmp import QMPResponseError
-from qemu.qmp.qom_common import QOMCommand
+from . import QMPResponseError
+from .qom_common import QOMCommand
fuse.fuse_python_api = (0, 2)
@@ -208,7 +204,3 @@ def readdir(self, path: str, fh: IO[bytes]) ->
Iterator[str]:
yield '..'
for item in self.qom_list(path):
yield item.name
-
-
-if __name__ == '__main__':
- sys.exit(QOMFuse.entry_point())
--
2.31.1
- Re: [PATCH v3 08/19] scripts/qom-fuse: apply flake8 rules, (continued)
- [PATCH v3 09/19] python: Add 'fh' to known-good variable names, John Snow, 2021/06/02
- [PATCH v3 10/19] scripts/qom-fuse: Apply pylint rules, John Snow, 2021/06/02
- [PATCH v3 11/19] scripts/qom-fuse: Add docstrings, John Snow, 2021/06/02
- [PATCH v3 12/19] scripts/qom-fuse: Convert to QOMCommand, John Snow, 2021/06/02
- [PATCH v3 13/19] scripts/qom-fuse: use QOMCommand.qom_list(), John Snow, 2021/06/02
- [PATCH v3 14/19] scripts/qom-fuse: ensure QOMFuse.read always returns bytes, John Snow, 2021/06/02
- [PATCH v3 15/19] scripts/qom-fuse: add static type hints, John Snow, 2021/06/02
- [PATCH v3 16/19] python: add optional FUSE dependencies, John Snow, 2021/06/02
- [PATCH v3 17/19] scripts/qom-fuse: move to python/qemu/qmp/qom_fuse.py,
John Snow <=
- [PATCH v3 19/19] python/qmp: add fuse command to 'qom' tools, John Snow, 2021/06/02
- [PATCH v3 18/19] scripts/qom-fuse: add redirection shim to python/qemu/qmp/qom-fuse.py, John Snow, 2021/06/02
- Re: [PATCH v3 00/19] Python: move /scripts/qmp/qom* to /python/qemu/qmp/qom*, John Snow, 2021/06/09