import: pypi: Use "pypi-uri" instead of building the URL manually.

* guix/import/pypi.scm (make-pypi-sexp): Use "pypi-uri".
* tests/pypi.scm: Update the tests accordingly.

guix/import/pypi.scm

@@ -165,7 +165,7 @@ (define (make-pypi-sexp name version source-url home-page synopsis
              (version ,version)
              (source (origin
                        (method url-fetch)
-                       (uri (string-append ,@(factorize-uri source-url version)))
+                       (uri (pypi-uri ,name version))
                        (sha256
                         (base32
                          ,(guix-hash-url temp)))))

tests/pypi.scm

@@ -84,8 +84,7 @@ (define test-requirements
          ('version "1.0.0")
          ('source ('origin
                     ('method 'url-fetch)
-                    ('uri ('string-append "https://example.com/foo-"
-                                          'version ".tar.gz"))
+                    ('uri (pypi-uri "foo" version))
                     ('sha256
                      ('base32
                       (? string? hash)))))