From 8440db459a10daa24282038f35bc0b6771bd51ab Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Mon, 23 Jul 2018 00:25:34 +0200
Subject: import: PyPI: Update redirected URL.

* guix/import/pypi.scm (guix-package->pypi-name, pypi->guix-package): Update
docstrings.
(pypi-package?): Test for pypi.org, too.
(pypi-fetch): s/pypi.python.org/pypi.org/
* tests/pypi.scm ("guix-package->pypi-name, new URL style",
"pypi->guix-package", "pypi->guix-package, wheels"): Likewise.
---
 guix/import/pypi.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'guix')

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 6beab6b010..25560bac46 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -51,8 +51,7 @@ (define-module (guix import pypi)
 (define (pypi-fetch name)
   "Return an alist representation of the PyPI metadata for the package NAME,
 or #f on failure."
-  (json-fetch-alist (string-append "https://pypi.python.org/pypi/"
-                                   name "/json")))
+  (json-fetch-alist (string-append "https://pypi.org/pypi/" name "/json")))
 
 ;; For packages found on PyPI that lack a source distribution.
 (define-condition-type &missing-source-error &error
@@ -87,7 +86,7 @@ (define (python->package-name name)
       (string-append "python-" (snake-case name))))
 
 (define (guix-package->pypi-name package)
-  "Given a Python PACKAGE built from pypi.python.org, return the name of the
+  "Given a Python PACKAGE built from pypi.org, return the name of the
 package on PyPI."
   (define (url->pypi-name url)
     (hyphen-package-name->name+version
@@ -269,7 +268,7 @@ (define (make-pypi-sexp name version source-url wheel-url home-page synopsis
              (license ,(license->symbol license)))))))
 
 (define (pypi->guix-package package-name)
-  "Fetch the metadata for PACKAGE-NAME from pypi.python.org, and return the
+  "Fetch the metadata for PACKAGE-NAME from pypi.org, and return the
 `package' s-expression corresponding to that package, or #f on failure."
   (let ((package (pypi-fetch package-name)))
     (and package
@@ -304,7 +303,8 @@ (define (pypi-package? package)
   "Return true if PACKAGE is a Python package from PyPI."
 
   (define (pypi-url? url)
-    (or (string-prefix? "https://pypi.python.org/" url)
+    (or (string-prefix? "https://pypi.org/" url)
+        (string-prefix? "https://pypi.python.org/" url)
         (string-prefix? "https://pypi.io/packages" url)))
 
   (let ((source-url (and=> (package-source package) origin-uri))
-- 
cgit v1.2.3