From patchwork Sat Dec 10 01:32:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 704689 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tbBSZ1m1Xz9s65 for ; Sat, 10 Dec 2016 12:33:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=6wind-com.20150623.gappssmtp.com header.i=@6wind-com.20150623.gappssmtp.com header.b="aVFWc8m1"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tbBSZ0hZLzDw9P for ; Sat, 10 Dec 2016 12:33:18 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=6wind-com.20150623.gappssmtp.com header.i=@6wind-com.20150623.gappssmtp.com header.b="aVFWc8m1"; dkim-atps=neutral X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Received: from mail-wm0-x230.google.com (mail-wm0-x230.google.com [IPv6:2a00:1450:400c:c09::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tbBRv18QTzDw7m for ; Sat, 10 Dec 2016 12:32:42 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=6wind-com.20150623.gappssmtp.com header.i=@6wind-com.20150623.gappssmtp.com header.b="aVFWc8m1"; dkim-atps=neutral Received: by mail-wm0-x230.google.com with SMTP id f82so2412578wmf.1 for ; Fri, 09 Dec 2016 17:32:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=BqV0aUxyaw/yefEWcd8Bj/kfb2XgwpOnJkgPGgVHBQM=; b=aVFWc8m1VO7svGODjiCQXUdYoCcVmqXG27/5G0jO+VAd5VEtmSsmfCMnS25cvzSVxN qvs6XLa18xWWqz/PfUCv39RuhwQ1BoBdg/6MTlgMQePn5HBox4AY2mlqeBmjCl+xhQm2 yf3FVAkHx4WbqEKTo9SAMIOgkks9BdWuiwXlgxitR0gqn9hkwqWaDMoBAqTNtp0+Ch/t 6Auvqq60jOPWs4UO7a8WtPuWZCrcGPsBTfwkZ3ho6EAc6QBtXAJf6aXw3TPbOypOlhZo njt7RPGHTYA0M9w7egTGxFfg+8NAePz2oMv2ERqPHelQaEL8uW4YQy6KeAmqYtI5lwo/ BF5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=BqV0aUxyaw/yefEWcd8Bj/kfb2XgwpOnJkgPGgVHBQM=; b=N2CmD3NAUytTL+vMwQfsvqPl1tczVdKa8CAsvueO/HjHwar/OMn0LNsWAgByhyq0i6 5B9GMXAv/KaOLdZ/UKV1hnAytjo6OLl8ZsQp5k2pZESJNBn5+fzI9ZASDSMtr6qJWnDR RXsFui3B5JtKuwa9aW4tHP+9DyrlNusSea45X2vRzUfOyE/Yo7wemFCRIDRBJzNYYbPI ogKX3jMbtLtHlyfw0MPrE2943dcLatQHB8S00MjWmP/YyQbL0ikaRSllcehiy94r9ke2 2DTzBlZupgGTmc+fsRTQVysAJ5k6apUwzQ7i+8GA3OvhrAXQe7Kk61bNy7IkMR5Hq881 3I4g== X-Gm-Message-State: AKaTC00N1585D9GtpF1R6bNvggBL8CbUMbQ9mTBL1dLlLNW4qmHgMe0bAdn/TO5K8acIZqV7 X-Received: by 10.28.46.144 with SMTP id u138mr8566469wmu.136.1481333559253; Fri, 09 Dec 2016 17:32:39 -0800 (PST) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id d64sm23299237wmh.3.2016.12.09.17.32.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Dec 2016 17:32:38 -0800 (PST) From: Thomas Monjalon To: patchwork@lists.ozlabs.org Subject: [PATCH 3/3] pwclient: Fix Python 3 encoding of received strings Date: Sat, 10 Dec 2016 02:32:32 +0100 Message-Id: <1481333552-2294-4-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1481333552-2294-1-git-send-email-thomas.monjalon@6wind.com> References: <1481333552-2294-1-git-send-email-thomas.monjalon@6wind.com> X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" The conversion encode("utf-8") makes a byte stream which is poorly printed with Python 3. However this encoding is required for Popen.communicate() but must be done after str.join() which applies to a real string. Signed-off-by: Thomas Monjalon Reviewed-by: Stephen Finucane --- patchwork/bin/pwclient | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/patchwork/bin/pwclient b/patchwork/bin/pwclient index 42a7fd0..5a9e93c 100755 --- a/patchwork/bin/pwclient +++ b/patchwork/bin/pwclient @@ -269,7 +269,7 @@ def action_check_info(rpc, check_id): print(s) print('-' * len(s)) for key, value in sorted(check.items()): - print("- %- 14s: %s" % (key, unicode(value).encode("utf-8"))) + print("- %- 14s: %s" % (key, unicode(value))) def action_check_create(rpc, patch_id, context, state, url, description): @@ -293,7 +293,7 @@ def action_info(rpc, patch_id): print(s) print('-' * len(s)) for key, value in sorted(patch.items()): - print("- %- 14s: %s" % (key, unicode(value).encode("utf-8"))) + print("- %- 14s: %s" % (key, unicode(value))) def action_get(rpc, patch_id): @@ -311,7 +311,7 @@ def action_get(rpc, patch_id): i += 1 with open(fname, 'w') as f: - f.write(unicode(s).encode("utf-8")) + f.write(unicode(s)) print('Saved patch to %s' % fname) @@ -748,15 +748,15 @@ def main(): for patch_id in non_empty(h, patch_ids): s = rpc.patch_get_mbox(patch_id) if len(s) > 0: - i.append(unicode(s).encode("utf-8")) + i.append(unicode(s)) if len(i) > 0: - pager.communicate(input="\n".join(i)) + pager.communicate(input="\n".join(i).encode("utf-8")) pager.stdin.close() else: for patch_id in non_empty(h, patch_ids): s = rpc.patch_get_mbox(patch_id) if len(s) > 0: - print(unicode(s).encode("utf-8")) + print(unicode(s)) elif action == 'info': for patch_id in non_empty(h, patch_ids):