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=-5.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 AED2BC10DCE for ; Tue, 24 Mar 2020 21:18:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8AA242070A for ; Tue, 24 Mar 2020 21:18:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727894AbgCXVSa (ORCPT ); Tue, 24 Mar 2020 17:18:30 -0400 Received: from fieldses.org ([173.255.197.46]:53742 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727160AbgCXVSa (ORCPT ); Tue, 24 Mar 2020 17:18:30 -0400 Received: by fieldses.org (Postfix, from userid 2815) id A7FC21F65; Tue, 24 Mar 2020 17:18:29 -0400 (EDT) Date: Tue, 24 Mar 2020 17:18:29 -0400 From: "J. Bruce Fields" To: Tigran Mkrtchyan Cc: linux-nfs@vger.kernel.org Subject: Re: [PATCH] rpc: fix str to bytes conversion Message-ID: <20200324211829.GB18421@fieldses.org> References: <20200318104031.289921-1-tigran.mkrtchyan@desy.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200318104031.289921-1-tigran.mkrtchyan@desy.de> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Applied.--b. On Wed, Mar 18, 2020 at 11:40:31AM +0100, Tigran Mkrtchyan wrote: > fix back channel ping from server > --- > rpc/rpc.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/rpc/rpc.py b/rpc/rpc.py > index c536384..d15cf06 100644 > --- a/rpc/rpc.py > +++ b/rpc/rpc.py > @@ -693,8 +693,11 @@ class ConnectionHandler(object): > status, result, notify = tuple > if result is None: > result = b'' > + if isinstance(result, str): > + result = bytes(result, encoding='UTF-8') > + > if not isinstance(result, bytes): > - raise TypeError("Expected string") > + raise TypeError("Expected bytes, got %s" % type(result)) > # status, result = method(msg_data, call_info) > log_t.debug("Called method, got %r, %r" % (status, result)) > except rpclib.RPCDrop: > -- > 2.25.1