From nobody Mon Feb 9 12:10:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1624058605880573.9144279613809; Fri, 18 Jun 2021 16:23:25 -0700 (PDT) Received: from localhost ([::1]:60844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luNpc-0007rg-LX for importer@patchew.org; Fri, 18 Jun 2021 19:23:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luNYX-0007Em-SS for qemu-devel@nongnu.org; Fri, 18 Jun 2021 19:05:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luNYT-0006Jv-7h for qemu-devel@nongnu.org; Fri, 18 Jun 2021 19:05:45 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-413-RSu3dC1lPAevgNEtM26Riw-1; Fri, 18 Jun 2021 19:05:35 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26C5F800C78; Fri, 18 Jun 2021 23:05:34 +0000 (UTC) Received: from scv.redhat.com (ovpn-113-126.rdu2.redhat.com [10.10.113.126]) by smtp.corp.redhat.com (Postfix) with ESMTP id 083651017CE5; Fri, 18 Jun 2021 23:05:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624057538; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pcAFZannce9An59VjUiueBzcaX8aRNvu9oWB3HTzKaY=; b=PYpSF/yGGCbc0O9RTC3kOEbJ784JGLadu94hzS4ODYJsNV0TdvdOnIYukeMCLQKtyZcu1k MqM5vcIc0XL/M5N6Dze7HN+4SyXGe/8RtMT0uarS7U1tNl/KGPRE2eiWkFQdgtSyF/Nf60 0ubuOh4vaiT6xGWT9oT3XWwDIrAEZec= X-MC-Unique: RSu3dC1lPAevgNEtM26Riw-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PULL 32/72] scripts/qmp-shell: Apply flake8 rules Date: Fri, 18 Jun 2021 19:04:15 -0400 Message-Id: <20210618230455.2891199-33-jsnow@redhat.com> In-Reply-To: <20210618230455.2891199-1-jsnow@redhat.com> References: <20210618230455.2891199-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.194, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Markus Armbruster , John Snow , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" A lot of fiddling around to get us below 80 columns. Signed-off-by: John Snow Message-id: 20210607200649.1840382-3-jsnow@redhat.com Signed-off-by: John Snow --- scripts/qmp/qmp-shell | 64 +++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index a00efe6fea..62a6377e06 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -88,6 +88,7 @@ class QMPCompleter(list): else: state -=3D 1 =20 + class QMPShellError(Exception): pass =20 @@ -105,6 +106,7 @@ class FuzzyJSON(ast.NodeTransformer): node.id =3D 'None' return node =20 + # TODO: QMPShell's interface is a bit ugly (eg. _fill_completion() and # _execute_cmd()). Let's design a better one. class QMPShell(qmp.QEMUMonitorProtocol): @@ -131,8 +133,8 @@ class QMPShell(qmp.QEMUMonitorProtocol): readline.set_history_length(1024) readline.set_completer(self._completer.complete) readline.parse_and_bind("tab: complete") - # XXX: default delimiters conflict with some command names (eg. qu= ery-), - # clearing everything as it doesn't seem to matter + # NB: default delimiters conflict with some command names + # (eg. query-), clearing everything as it doesn't seem to matter readline.set_completer_delims('') try: readline.read_history_file(self._histfile) @@ -180,7 +182,9 @@ class QMPShell(qmp.QEMUMonitorProtocol): for arg in tokens: (key, sep, val) =3D arg.partition('=3D') if sep !=3D '=3D': - raise QMPShellError("Expected a key=3Dvalue pair, got '%s'= " % arg) + raise QMPShellError( + f"Expected a key=3Dvalue pair, got '{arg!s}'" + ) =20 value =3D self.__parse_value(val) optpath =3D key.split('.') @@ -189,14 +193,16 @@ class QMPShell(qmp.QEMUMonitorProtocol): curpath.append(p) d =3D parent.get(p, {}) if type(d) is not dict: - raise QMPShellError('Cannot use "%s" as both leaf and = non-leaf key' % '.'.join(curpath)) + msg =3D 'Cannot use "{:s}" as both leaf and non-leaf k= ey' + raise QMPShellError(msg.format('.'.join(curpath))) parent[p] =3D d parent =3D d if optpath[-1] in parent: if type(parent[optpath[-1]]) is dict: - raise QMPShellError('Cannot use "%s" as both leaf and = non-leaf key' % '.'.join(curpath)) + msg =3D 'Cannot use "{:s}" as both leaf and non-leaf k= ey' + raise QMPShellError(msg.format('.'.join(curpath))) else: - raise QMPShellError('Cannot set "%s" multiple times' %= key) + raise QMPShellError(f'Cannot set "{key}" multiple time= s') parent[optpath[-1]] =3D value =20 def __build_cmd(self, cmdline): @@ -206,7 +212,8 @@ class QMPShell(qmp.QEMUMonitorProtocol): =20 < command-name > [ arg-name1=3Darg1 ] ... [ arg-nameN=3DargN ] """ - cmdargs =3D re.findall(r'''(?:[^\s"']|"(?:\\.|[^"])*"|'(?:\\.|[^']= )*')+''', cmdline) + argument_regex =3D r'''(?:[^\s"']|"(?:\\.|[^"])*"|'(?:\\.|[^'])*')= +''' + cmdargs =3D re.findall(argument_regex, cmdline) =20 # Transactional CLI entry/exit: if cmdargs[0] =3D=3D 'transaction(': @@ -215,9 +222,12 @@ class QMPShell(qmp.QEMUMonitorProtocol): elif cmdargs[0] =3D=3D ')' and self._transmode: self._transmode =3D False if len(cmdargs) > 1: - raise QMPShellError("Unexpected input after close of Trans= action sub-shell") - qmpcmd =3D { 'execute': 'transaction', - 'arguments': { 'actions': self._actions } } + msg =3D 'Unexpected input after close of Transaction sub-s= hell' + raise QMPShellError(msg) + qmpcmd =3D { + 'execute': 'transaction', + 'arguments': {'actions': self._actions} + } self._actions =3D list() return qmpcmd =20 @@ -228,7 +238,7 @@ class QMPShell(qmp.QEMUMonitorProtocol): # Parse and then cache this Transactional Action if self._transmode: finalize =3D False - action =3D { 'type': cmdargs[0], 'data': {} } + action =3D {'type': cmdargs[0], 'data': {}} if cmdargs[-1] =3D=3D ')': cmdargs.pop(-1) finalize =3D True @@ -237,7 +247,7 @@ class QMPShell(qmp.QEMUMonitorProtocol): return self.__build_cmd(')') if finalize else None =20 # Standard command: parse and return it to be executed. - qmpcmd =3D { 'execute': cmdargs[0], 'arguments': {} } + qmpcmd =3D {'execute': cmdargs[0], 'arguments': {}} self.__cli_expr(cmdargs[1:], qmpcmd['arguments']) return qmpcmd =20 @@ -278,7 +288,7 @@ class QMPShell(qmp.QEMUMonitorProtocol): print('Connected') return version =3D self._greeting['QMP']['version']['qemu'] - print('Connected to QEMU %d.%d.%d\n' % (version['major'],version['= minor'],version['micro'])) + print("Connected to QEMU {major}.{minor}.{micro}\n".format(**versi= on)) =20 def get_prompt(self): if self._transmode: @@ -307,6 +317,7 @@ class QMPShell(qmp.QEMUMonitorProtocol): def set_verbosity(self, verbose): self._verbose =3D verbose =20 + class HMPShell(QMPShell): def __init__(self, address): QMPShell.__init__(self, address) @@ -315,7 +326,7 @@ class HMPShell(QMPShell): def __cmd_completion(self): for cmd in self.__cmd_passthrough('help')['return'].split('\r\n'): if cmd and cmd[0] !=3D '[' and cmd[0] !=3D '\t': - name =3D cmd.split()[0] # drop help text + name =3D cmd.split()[0] # drop help text if name =3D=3D 'info': continue if name.find('|') !=3D -1: @@ -327,7 +338,7 @@ class HMPShell(QMPShell): else: name =3D opt[0] self._completer.append(name) - self._completer.append('help ' + name) # help completion + self._completer.append('help ' + name) # help completion =20 def __info_completion(self): for cmd in self.__cmd_passthrough('info')['return'].split('\r\n'): @@ -343,17 +354,21 @@ class HMPShell(QMPShell): self.__info_completion() self.__other_completion() =20 - def __cmd_passthrough(self, cmdline, cpu_index =3D 0): - return self.cmd_obj({ 'execute': 'human-monitor-command', 'argumen= ts': - { 'command-line': cmdline, - 'cpu-index': cpu_index } }) + def __cmd_passthrough(self, cmdline, cpu_index=3D0): + return self.cmd_obj({ + 'execute': 'human-monitor-command', + 'arguments': { + 'command-line': cmdline, + 'cpu-index': cpu_index + } + }) =20 def _execute_cmd(self, cmdline): if cmdline.split()[0] =3D=3D "cpu": # trap the cpu command, it requires special setting try: idx =3D int(cmdline.split()[1]) - if not 'return' in self.__cmd_passthrough('info version', = idx): + if 'return' not in self.__cmd_passthrough('info version', = idx): print('bad CPU index') return True self.__cpu_index =3D idx @@ -377,20 +392,26 @@ class HMPShell(QMPShell): def show_banner(self): QMPShell.show_banner(self, msg=3D'Welcome to the HMP shell!') =20 + def die(msg): sys.stderr.write('ERROR: %s\n' % msg) sys.exit(1) =20 + def fail_cmdline(option=3DNone): if option: sys.stderr.write('ERROR: bad command-line option \'%s\'\n' % optio= n) - sys.stderr.write('qmp-shell [ -v ] [ -p ] [ -H ] [ -N ] < UNIX socket = path> | < TCP address:port >\n') + sys.stderr.write( + 'qmp-shell [ -v ] [ -p ] [ -H ] [ -N ] ' + '< UNIX socket path> | < TCP address:port >\n' + ) sys.stderr.write(' -v Verbose (echo command sent and received)\= n') sys.stderr.write(' -p Pretty-print JSON\n') sys.stderr.write(' -H Use HMP interface\n') sys.stderr.write(' -N Skip negotiate (for qemu-ga)\n') sys.exit(1) =20 + def main(): addr =3D '' qemu =3D None @@ -440,5 +461,6 @@ def main(): pass qemu.close() =20 + if __name__ =3D=3D '__main__': main() --=20 2.31.1