branch master updated: import: pypi: Handle 'null instead of #nil.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

arunisaac pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new a2daee8  import: pypi: Handle 'null instead of #nil.
a2daee8 is described below

commit a2daee843d93abd5cc15a6277b6a3e7118fe047a
Author: Arun Isaac <arunisaac@systemreboot.net>
AuthorDate: Sun Jul 5 04:07:35 2020 +0530

    import: pypi: Handle 'null instead of #nil.
    
    * 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 b20c230..a2b5d99 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020 Lars-Dominik Braun <ldb@leibniz-psychology.org>
+;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; 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 <pypi-project> make-pypi-project pypi-project?