From patchwork Sat Jul 4 22:41:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 23065 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 2157127BBE3; Sat, 4 Jul 2020 23:42:09 +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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,T_DKIM_INVALID, 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 E080727BBE1 for ; Sat, 4 Jul 2020 23:42:08 +0100 (BST) Received: from localhost ([::1]:59408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jrqrI-000207-Ah for patchwork@mira.cbaines.net; Sat, 04 Jul 2020 18:42:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrqrC-0001zh-B5 for guix-patches@gnu.org; Sat, 04 Jul 2020 18:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48249) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jrqrC-0001CN-1X for guix-patches@gnu.org; Sat, 04 Jul 2020 18:42:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jrqrB-0002R4-UO for guix-patches@gnu.org; Sat, 04 Jul 2020 18:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42206] [PATCH] import: pypi: Handle 'null instead of #nil. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 04 Jul 2020 22:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42206 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42206@debbugs.gnu.org Cc: Arun Isaac X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15939025209353 (code B ref -1); Sat, 04 Jul 2020 22:42:01 +0000 Received: (at submit) by debbugs.gnu.org; 4 Jul 2020 22:42:00 +0000 Received: from localhost ([127.0.0.1]:59795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrqrA-0002Qm-EL for submit@debbugs.gnu.org; Sat, 04 Jul 2020 18:42:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:58098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jrqr7-0002Qd-WD for submit@debbugs.gnu.org; Sat, 04 Jul 2020 18:41:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrqr7-0001z0-OH for guix-patches@gnu.org; Sat, 04 Jul 2020 18:41:57 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:53458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jrqr3-0001Bf-IU for guix-patches@gnu.org; Sat, 04 Jul 2020 18:41:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=zb6S3BmYdyF+Uig8GeIAnBnvb92I5Zg0RIPDDDrUSrE=; b=fk15Ncwm/eSXm5JvWa2QHhPjTq xsK036NGAuwL+ThEJSXnoPQEOobEHnWKCcul8CK2idWxYOE24bLPV+v1lZCtsHIgamfiMroCOLYYy //+hdUctdeIpNd5DG/7HfCJIqeI40VqaFH3Do9kO44jn+4XzvjxCAHbIVPnqWTA9A09A=; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1jrqqx-0008wM-0I; Sun, 05 Jul 2020 04:11:47 +0530 From: Arun Isaac Date: Sun, 5 Jul 2020 04:11:45 +0530 Message-Id: <20200704224145.5828-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Received-SPF: pass client-ip=139.59.75.54; envelope-from=arunisaac@systemreboot.net; helo=mugam.systemreboot.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/04 17:37:28 X-ACL-Warn: Detected OS = ??? X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-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 * guix/import/pypi.scm (non-empty-string-or-false): guile-json now returns 'null instead of #nil for null JSON values. Handle it. --- guix/import/pypi.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index b20c2300f6..a2b5d995ef 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Lars-Dominik Braun +;;; Copyright © 2020 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,7 +64,7 @@ (match-lambda ("" #f) ((? string? str) str) - ((or #nil #f) #f))) + ((or 'null #f) #f))) ;; PyPI project. (define-json-mapping make-pypi-project pypi-project?