From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FD00C43613 for ; Thu, 20 Jun 2019 15:23:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0702D2070B for ; Thu, 20 Jun 2019 15:23:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0702D2070B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdyu2-0001fl-7T for qemu-devel@archiver.kernel.org; Thu, 20 Jun 2019 11:23:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44908) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hdyoR-0005nx-AY for qemu-devel@nongnu.org; Thu, 20 Jun 2019 11:17:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hdyoN-0003TP-1o for qemu-devel@nongnu.org; Thu, 20 Jun 2019 11:17:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48930) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hdyoE-0003Ag-UZ for qemu-devel@nongnu.org; Thu, 20 Jun 2019 11:17:10 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7F4CA2F8BFC for ; Thu, 20 Jun 2019 15:16:55 +0000 (UTC) Received: from localhost (unknown [10.43.2.182]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85B7560579; Thu, 20 Jun 2019 15:16:54 +0000 (UTC) Date: Thu, 20 Jun 2019 17:16:49 +0200 From: Igor Mammedov To: Eduardo Habkost Message-ID: <20190620171649.3b85c78e@redhat.com> In-Reply-To: <20190620134524.GH3300@habkost.net> References: <20190618142931.1694-1-imammedo@redhat.com> <20190619132924.GA32240@localhost.localdomain> <20190620111103.297277bc@redhat.com> <20190620134524.GH3300@habkost.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 20 Jun 2019 15:16:55 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH] qmp: make qmp-shell work with python3 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: qemu-devel@nongnu.org, armbru@redhat.com, Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, 20 Jun 2019 10:45:24 -0300 Eduardo Habkost wrote: > On Thu, Jun 20, 2019 at 11:11:03AM +0200, Igor Mammedov wrote: > > On Wed, 19 Jun 2019 09:29:24 -0400 > > Cleber Rosa wrote: > > > > > On Tue, Jun 18, 2019 at 10:29:31AM -0400, Igor Mammedov wrote: > > > > python3 doesn't have raw_input(), so qmp-shell breaks. > > > > Use input() instead and override it with raw_input() > > > > if running on python2. > > > > > > > > Signed-off-by: Igor Mammedov > > > > --- > > > > scripts/qmp/qmp-shell | 6 +++++- > > > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell > > > > index 7776c7b141..8c49b39afa 100755 > > > > --- a/scripts/qmp/qmp-shell > > > > +++ b/scripts/qmp/qmp-shell > > > > @@ -308,7 +308,11 @@ class QMPShell(qmp.QEMUMonitorProtocol): > > > > @return True if execution was ok, return False if disconnected. > > > > """ > > > > try: > > > > - cmdline = raw_input(prompt) > > > > + try: # attempt to set Python2 override > > > > + import __builtin__; > > > > + getattr(__builtin__, 'raw_input', input) > > > > + except ModuleNotFoundError: pass > > > > > > Something like: > > > > > > if sys.version_info[0] == 2: > > > input = raw_input > > > > > > Also does the job, and may be considered simpler and easier to read. > > > > that causes scope issues on python3 > > Which issues? It should work if you set it at the module top > level. We had done this before in other scripts. e.g.: it works if it is moved to the top, I'll post v2 > $ git grep -1 'range = xrange' > tests/qemu-iotests/044-if sys.version_info.major == 2: > tests/qemu-iotests/044: range = xrange > tests/qemu-iotests/044- > -- > tests/qemu-iotests/163-if sys.version_info.major == 2: > tests/qemu-iotests/163: range = xrange > tests/qemu-iotests/163- > >