[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 29/42] scripts/qmp-shell: unprivatize 'pretty' property
From: |
John Snow |
Subject: |
[PATCH 29/42] scripts/qmp-shell: unprivatize 'pretty' property |
Date: |
Mon, 7 Jun 2021 16:06:36 -0400 |
Similar to verbose, there's no reason this needs to be hidden.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qmp/qmp-shell | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index b465c7f9e2..f14fe211cc 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -135,11 +135,11 @@ class QMPShell(qmp.QEMUMonitorProtocol):
super().__init__(address)
self._greeting: Optional[QMPMessage] = None
self._completer = QMPCompleter()
- self._pretty = pretty
self._transmode = False
self._actions: List[QMPMessage] = []
self._histfile = os.path.join(os.path.expanduser('~'),
'.qmp-shell_history')
+ self.pretty = pretty
self.verbose = verbose
def _fill_completion(self) -> None:
@@ -274,10 +274,9 @@ class QMPShell(qmp.QEMUMonitorProtocol):
return qmpcmd
def _print(self, qmp_message: object) -> None:
- indent = None
- if self._pretty:
- indent = 4
- jsobj = json.dumps(qmp_message, indent=indent, sort_keys=self._pretty)
+ jsobj = json.dumps(qmp_message,
+ indent=4 if self.pretty else None,
+ sort_keys=self.pretty)
print(str(jsobj))
def _execute_cmd(self, cmdline: str) -> bool:
--
2.31.1
- [PATCH 03/42] scripts/qmp-shell: fix show_banner signature, (continued)
- [PATCH 03/42] scripts/qmp-shell: fix show_banner signature, John Snow, 2021/06/07
- [PATCH 21/42] scripts/qmp-shell: remove prompt argument from read_exec_command, John Snow, 2021/06/07
- [PATCH 08/42] scripts/qmp-shell: Use python3-style super(), John Snow, 2021/06/07
- [PATCH 11/42] scripts/qmp-shell: ignore visit_Name name, John Snow, 2021/06/07
- [PATCH 09/42] scripts/qmp-shell: declare verbose in __init__, John Snow, 2021/06/07
- [PATCH 14/42] scripts/qmp-shell: fix shell history exception handling, John Snow, 2021/06/07
- [PATCH 20/42] scripts/qmp-shell: move get_prompt() to prompt property, John Snow, 2021/06/07
- [PATCH 10/42] scripts/qmp-shell: use triple-double-quote docstring style, John Snow, 2021/06/07
- [PATCH 18/42] scripts/qmp-shell: Add pretty attribute to HMP shell, John Snow, 2021/06/07
- [PATCH 15/42] scripts/qmp-shell: remove if-raise-else patterns, John Snow, 2021/06/07
- [PATCH 29/42] scripts/qmp-shell: unprivatize 'pretty' property,
John Snow <=
- [PATCH 19/42] scripts/qmp-shell: Make verbose a public attribute, John Snow, 2021/06/07
- [PATCH 25/42] scripts/qmp-shell: initialize completer early, John Snow, 2021/06/07
- [PATCH 27/42] scripts/qmp-shell: add mypy types, John Snow, 2021/06/07
- [PATCH 24/42] scripts/qmp-shell: refactor QMPCompleter, John Snow, 2021/06/07
- [PATCH 16/42] scripts/qmp-shell: use isinstance() instead of type(), John Snow, 2021/06/07
- [PATCH 30/42] python/qmp: return generic type from context manager, John Snow, 2021/06/07
- [PATCH 33/42] scripts/qmp-shell: remove TODO, John Snow, 2021/06/07
- [PATCH 23/42] scripts/qmp-shell: Fix "FuzzyJSON" parser, John Snow, 2021/06/07
- [PATCH 35/42] scripts/qmp-shell: Remove too-broad-exception, John Snow, 2021/06/07
- [PATCH 26/42] python/qmp: add QMPObject type alias, John Snow, 2021/06/07