From patchwork Tue Jun 16 11:51:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tanguy LE CARROUR X-Patchwork-Id: 22742 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ECE3A27BBE3; Tue, 16 Jun 2020 12:53:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 674DE27BBE1 for ; Tue, 16 Jun 2020 12:53:11 +0100 (BST) Received: from localhost ([::1]:46060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jlA9P-0003Ur-08 for patchwork@mira.cbaines.net; Tue, 16 Jun 2020 07:53:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlA9G-0003Uh-Sf for guix-patches@gnu.org; Tue, 16 Jun 2020 07:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jlA9G-0006iR-JY for guix-patches@gnu.org; Tue, 16 Jun 2020 07:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jlA9G-0006kL-GR for guix-patches@gnu.org; Tue, 16 Jun 2020 07:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41891] [PATCH] gnu: python-memcached: Add patch to fix syntax warnings. Resent-From: Tanguy Le Carrour Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jun 2020 11:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41891 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41891@debbugs.gnu.org Cc: Tanguy Le Carrour X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159230832925871 (code B ref -1); Tue, 16 Jun 2020 11:53:02 +0000 Received: (at submit) by debbugs.gnu.org; 16 Jun 2020 11:52:09 +0000 Received: from localhost ([127.0.0.1]:48414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlA8A-0006ig-LN for submit@debbugs.gnu.org; Tue, 16 Jun 2020 07:52:09 -0400 Received: from lists.gnu.org ([209.51.188.17]:48352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jlA85-0006iV-Bv for submit@debbugs.gnu.org; Tue, 16 Jun 2020 07:51:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlA85-000398-3X for guix-patches@gnu.org; Tue, 16 Jun 2020 07:51:49 -0400 Received: from relay1-d.mail.gandi.net ([217.70.183.193]:65479) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jlA7z-0006W8-RZ for guix-patches@gnu.org; Tue, 16 Jun 2020 07:51:48 -0400 X-Originating-IP: 176.159.32.89 Received: from rafflesia.easter-eggs.fr (176-159-32-89.abo.bbox.fr [176.159.32.89]) (Authenticated sender: tanguy@bioneland.org) by relay1-d.mail.gandi.net (Postfix) with ESMTPA id 89E7724000C; Tue, 16 Jun 2020 11:51:39 +0000 (UTC) From: Tanguy Le Carrour Date: Tue, 16 Jun 2020 13:51:13 +0200 Message-Id: <20200616115113.5852-1-tanguy@bioneland.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Received-SPF: none client-ip=217.70.183.193; envelope-from=tanguy@bioneland.org; helo=relay1-d.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/16 06:11:59 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_NONE=0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/python-memcached-syntax-warnings.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python-xyz.scm (python-memcached)[source]: Add it. --- gnu/local.mk | 2 ++ .../python-memcached-syntax-warnings.patch | 24 +++++++++++++++++++ gnu/packages/python-xyz.scm | 3 ++- 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-memcached-syntax-warnings.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7333427850..36a417865f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -35,6 +35,7 @@ # Copyright © 2020 Ryan Prior # Copyright © 2020 Jan Wielkiewicz # Copyright © 2020 Brice Waegeneire +# Copyright © 2020 Tanguy Le Carrour # # This file is part of GNU Guix. # @@ -1426,6 +1427,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-jedi-sort-project-test.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ + %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ %D%/packages/patches/python-testtools.patch \ %D%/packages/patches/python-packaging-test-arch.patch \ diff --git a/gnu/packages/patches/python-memcached-syntax-warnings.patch b/gnu/packages/patches/python-memcached-syntax-warnings.patch new file mode 100644 index 0000000000..6b79c3634b --- /dev/null +++ b/gnu/packages/patches/python-memcached-syntax-warnings.patch @@ -0,0 +1,24 @@ +Problem reported upstream: +https://github.com/linsomniac/python-memcached/issues/176 + +--- + memcache.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/memcache.py b/memcache.py +index 05b6657..b935681 100644 +--- a/memcache.py ++++ b/memcache.py +@@ -1300,8 +1300,8 @@ class Client(threading.local): + key = key[1] + if key is None: + raise Client.MemcachedKeyNoneError("Key is None") +- if key is '': +- if key_extra_len is 0: ++ if key == '': ++ if key_extra_len == 0: + raise Client.MemcachedKeyNoneError("Key is empty") + + # key is empty but there is some other component to key +-- +2.26.2 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 7e0a738d51..c3d1b8cf7e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -11782,7 +11782,8 @@ running in.") (uri (pypi-uri "python-memcached" version)) (sha256 (base32 - "0kvyapavbirk2x3n1jx4yb9nyigrj1s3x15nm3qhpvhkpqvqdqm2")))) + "0kvyapavbirk2x3n1jx4yb9nyigrj1s3x15nm3qhpvhkpqvqdqm2")) + (patches (search-patches "python-memcached-syntax-warnings.patch")))) (build-system python-build-system) (propagated-inputs `(("python-six" ,python-six))) (home-page