[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     ff4c2bbf52663cc7a233e2dbccdd33b193821168
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 19:26:19 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 12:19:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff4c2bbf

pypi.eclass: Translate version once in the default scenario

Instead of translating version two times, once in pypi_sdist_url
and then when setting S, do it once and store the result.  This gives
roughly 371 ops / s, i.e. a 13% speedup.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/pypi.eclass | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/eclass/pypi.eclass b/eclass/pypi.eclass
index 732b0c6184ef..a8a179d5a3a4 100644
--- a/eclass/pypi.eclass
+++ b/eclass/pypi.eclass
@@ -226,12 +226,14 @@ pypi_wheel_url() {
 # @DESCRIPTION:
 # Set global variables, SRC_URI and S.
 _pypi_set_globals() {
+       local version=$(pypi_translate_version "${PV}")
+
        if [[ ${PYPI_NO_NORMALIZE} ]]; then
-               SRC_URI="$(pypi_sdist_url --no-normalize)"
-               S="${WORKDIR}/${PYPI_PN}-$(pypi_translate_version "${PV}")"
+               SRC_URI="$(pypi_sdist_url --no-normalize "${PYPI_PN}" 
"${version}")"
+               S="${WORKDIR}/${PYPI_PN}-${version}"
        else
-               SRC_URI="$(pypi_sdist_url)"
-               S="${WORKDIR}/$(pypi_normalize_name 
"${PYPI_PN}")-$(pypi_translate_version "${PV}")"
+               SRC_URI="$(pypi_sdist_url "${PYPI_PN}" "${version}")"
+               S="${WORKDIR}/$(pypi_normalize_name "${PYPI_PN}")-${version}"
        fi
 }