/[gentoo-x86]/eclass/python.eclass
Gentoo

Diff of /eclass/python.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.128 Revision 1.152
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2012 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.128 2011/08/19 10:10:03 lxnay Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.152 2012/03/07 04:13:27 floppym Exp $
4 4
5# @ECLASS: python.eclass 5# @ECLASS: python.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Gentoo Python Project <python@gentoo.org> 7# Gentoo Python Project <python@gentoo.org>
8# @BLURB: Eclass for Python packages 8# @BLURB: Eclass for Python packages
9# @DESCRIPTION: 9# @DESCRIPTION:
10# The python eclass contains miscellaneous, useful functions for Python packages. 10# The python eclass contains miscellaneous, useful functions for Python packages.
11 11
12# Must call inherit before EXPORT_FUNCTIONS to avoid QA warning.
13if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
12inherit multilib 14 inherit multilib
15fi
13 16
17# Export pkg_setup every time to avoid issues with eclass inheritance order.
18if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
19 EXPORT_FUNCTIONS pkg_setup
20fi
21
22# Avoid processing this eclass more than once.
23if [[ -z "${_PYTHON_ECLASS_INHERITED}" ]]; then
24_PYTHON_ECLASS_INHERITED="1"
25
14if ! has "${EAPI:-0}" 0 1 2 3; then 26if ! has "${EAPI:-0}" 0 1 2 3 4; then
15 die "API of python.eclass in EAPI=\"${EAPI}\" not established" 27 die "API of python.eclass in EAPI=\"${EAPI}\" not established"
16fi 28fi
17 29
18_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7) 30_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
19_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2 3.3) 31_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
20_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython) 32_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
21_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.5) 33_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8)
22_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]}) 34_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
23 35
24# ================================================================================================ 36# ================================================================================================
25# ===================================== HANDLING OF METADATA ===================================== 37# ===================================== HANDLING OF METADATA =====================================
26# ================================================================================================ 38# ================================================================================================
384 _CYAN= 396 _CYAN=
385 _NORMAL= 397 _NORMAL=
386 fi 398 fi
387} 399}
388 400
389unset PYTHON_PKG_SETUP_EXECUTED
390
391_python_check_python_pkg_setup_execution() { 401_python_check_python_pkg_setup_execution() {
392 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return 402 [[ " ${FUNCNAME[@]:1} " =~ " "(python_set_active_version|python_pkg_setup)" " ]] && return
393 403
394 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then 404 if ! has "${EAPI:-0}" 0 1 2 3 && [[ -z "${PYTHON_PKG_SETUP_EXECUTED}" ]]; then
395 die "python_pkg_setup() not called" 405 die "python_pkg_setup() not called"
398 408
399# @FUNCTION: python_pkg_setup 409# @FUNCTION: python_pkg_setup
400# @DESCRIPTION: 410# @DESCRIPTION:
401# Perform sanity checks and initialize environment. 411# Perform sanity checks and initialize environment.
402# 412#
403# This function is exported in EAPI 2 and 3. Calling of this function is mandatory in EAPI >=4. 413# This function is exported in EAPI 2 and 3 when PYTHON_USE_WITH or PYTHON_USE_WITH_OR variable
414# is set and always in EAPI >=4. Calling of this function is mandatory in EAPI >=4.
404python_pkg_setup() { 415python_pkg_setup() {
405 if [[ "${EBUILD_PHASE}" != "setup" ]]; then 416 if [[ "${EBUILD_PHASE}" != "setup" ]]; then
406 die "${FUNCNAME}() can be used only in pkg_setup() phase" 417 die "${FUNCNAME}() can be used only in pkg_setup() phase"
407 fi 418 fi
408 419
418 export EPYTHON="$(PYTHON -f)" 429 export EPYTHON="$(PYTHON -f)"
419 else 430 else
420 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}" 431 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
421 fi 432 fi
422 433
434 if ! has "${EAPI:-0}" 0 1 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; then
435 if [[ "${PYTHON_USE_WITH_OPT}" ]]; then
436 if [[ "${PYTHON_USE_WITH_OPT}" == !* ]]; then
437 use ${PYTHON_USE_WITH_OPT#!} && return
438 else
439 use !${PYTHON_USE_WITH_OPT} && return
440 fi
441 fi
442
443 python_pkg_setup_check_USE_flags() {
444 local python_atom USE_flag
445 python_atom="$(python_get_implementational_package)"
446
447 for USE_flag in ${PYTHON_USE_WITH}; do
448 if ! has_version "${python_atom}[${USE_flag}]"; then
449 eerror "Please rebuild ${python_atom} with the following USE flags enabled: ${PYTHON_USE_WITH}"
450 die "Please rebuild ${python_atom} with the following USE flags enabled: ${PYTHON_USE_WITH}"
451 fi
452 done
453
454 for USE_flag in ${PYTHON_USE_WITH_OR}; do
455 if has_version "${python_atom}[${USE_flag}]"; then
456 return
457 fi
458 done
459
460 if [[ ${PYTHON_USE_WITH_OR} ]]; then
461 eerror "Please rebuild ${python_atom} with at least one of the following USE flags enabled: ${PYTHON_USE_WITH_OR}"
462 die "Please rebuild ${python_atom} with at least one of the following USE flags enabled: ${PYTHON_USE_WITH_OR}"
463 fi
464 }
465
466 if _python_package_supporting_installation_for_multiple_python_abis; then
467 PYTHON_SKIP_SANITY_CHECKS="1" python_execute_function -q python_pkg_setup_check_USE_flags
468 else
469 python_pkg_setup_check_USE_flags
470 fi
471
472 unset -f python_pkg_setup_check_USE_flags
473 fi
474
423 PYTHON_PKG_SETUP_EXECUTED="1" 475 PYTHON_PKG_SETUP_EXECUTED="1"
424} 476}
425
426if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
427 EXPORT_FUNCTIONS pkg_setup
428fi
429 477
430_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)' 478_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)'
431 479
432# @FUNCTION: python_convert_shebangs 480# @FUNCTION: python_convert_shebangs
433# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories] 481# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories]
434# @DESCRIPTION: 482# @DESCRIPTION:
435# Convert shebangs in specified files. Directories can be specified only with --recursive option. 483# Convert shebangs in specified files. Directories can be specified only with --recursive option.
436python_convert_shebangs() { 484python_convert_shebangs() {
437 _python_check_python_pkg_setup_execution 485 _python_check_python_pkg_setup_execution
438 486
439 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" 487 local argument file files=() only_executables="0" python_interpreter quiet="0" recursive="0" shebangs_converted="0"
440 488
441 while (($#)); do 489 while (($#)); do
442 case "$1" in 490 case "$1" in
443 -r|--recursive) 491 -r|--recursive)
444 recursive="1" 492 recursive="1"
499 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue 547 [[ "${only_executables}" == "1" && ! -x "${file}" ]] && continue
500 548
501 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then 549 if [[ "$(head -n1 "${file}")" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX} ]]; then
502 [[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue 550 [[ "$(sed -ne "2p" "${file}")" =~ ^"# Gentoo '".*"' wrapper script generated by python_generate_wrapper_scripts()"$ ]] && continue
503 551
552 shebangs_converted="1"
553
504 if [[ "${quiet}" == "0" ]]; then 554 if [[ "${quiet}" == "0" ]]; then
505 einfo "Converting shebang in '${file}'" 555 einfo "Converting shebang in '${file}'"
506 fi 556 fi
507 557
508 sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|pypy-c\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed" 558 sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|pypy-c\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed"
509 fi 559 fi
560 done
561
562 if [[ "${shebangs_converted}" == "0" ]]; then
563 ewarn "${FUNCNAME}(): Python scripts not found"
564 fi
565}
566
567# @FUNCTION: python_clean_py-compile_files
568# @USAGE: [-q|--quiet]
569# @DESCRIPTION:
570# Clean py-compile files to disable byte-compilation.
571python_clean_py-compile_files() {
572 _python_check_python_pkg_setup_execution
573
574 local file files=() quiet="0"
575
576 while (($#)); do
577 case "$1" in
578 -q|--quiet)
579 quiet="1"
580 ;;
581 -*)
582 die "${FUNCNAME}(): Unrecognized option '$1'"
583 ;;
584 *)
585 die "${FUNCNAME}(): Invalid usage"
586 ;;
587 esac
588 shift
589 done
590
591 while read -d $'\0' -r file; do
592 files+=("${file#./}")
593 done < <(find -name py-compile -type f -print0)
594
595 for file in "${files[@]}"; do
596 if [[ "${quiet}" == "0" ]]; then
597 einfo "Cleaning '${file}' file"
598 fi
599 echo "#!/bin/sh" > "${file}"
510 done 600 done
511} 601}
512 602
513# @FUNCTION: python_clean_installation_image 603# @FUNCTION: python_clean_installation_image
514# @USAGE: [-q|--quiet] 604# @USAGE: [-q|--quiet]
752 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}" 842 die "Active version of CPython 3 is not supported by ${CATEGORY}/${PF}"
753 fi 843 fi
754 else 844 else
755 python3_version="" 845 python3_version=""
756 fi 846 fi
847 fi
848
849 if [[ -z "${python2_version}" && -z "${python3_version}" ]]; then
850 eerror "${CATEGORY}/${PF} requires at least one of the following packages:"
851 for PYTHON_ABI in "${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]}" "${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]}"; do
852 if ! _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${RESTRICT_PYTHON_ABIS}"; then
853 eerror " dev-lang/python:${PYTHON_ABI}"
854 fi
855 done
856 die "No supported version of CPython installed"
757 fi 857 fi
758 858
759 if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then 859 if [[ -n "${python2_version}" && "${python_version}" == "2."* && "${python_version}" != "${python2_version}" ]]; then
760 eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink" 860 eerror "Python wrapper is configured incorrectly or '${EPREFIX}/usr/bin/python2' symlink"
761 eerror "is set incorrectly. Use \`eselect python\` to fix configuration." 861 eerror "is set incorrectly. Use \`eselect python\` to fix configuration."
919 python_default_function() { 1019 python_default_function() {
920 emake "$@" 1020 emake "$@"
921 } 1021 }
922 elif [[ "${EBUILD_PHASE}" == "test" ]]; then 1022 elif [[ "${EBUILD_PHASE}" == "test" ]]; then
923 python_default_function() { 1023 python_default_function() {
1024 # Stolen from portage's _eapi0_src_test()
1025 local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}"
924 if emake -j1 -n check &> /dev/null; then 1026 if ${emake_cmd} -j1 -n check &> /dev/null; then
925 emake -j1 check "$@" 1027 ${emake_cmd} -j1 check "$@"
926 elif emake -j1 -n test &> /dev/null; then 1028 elif ${emake_cmd} -j1 -n test &> /dev/null; then
927 emake -j1 test "$@" 1029 ${emake_cmd} -j1 test "$@"
928 fi 1030 fi
929 } 1031 }
930 elif [[ "${EBUILD_PHASE}" == "install" ]]; then 1032 elif [[ "${EBUILD_PHASE}" == "install" ]]; then
931 python_default_function() { 1033 python_default_function() {
932 emake DESTDIR="${D}" install "$@" 1034 emake DESTDIR="${D}" install "$@"
1189import os 1291import os
1190import re 1292import re
1191import subprocess 1293import subprocess
1192import sys 1294import sys
1193 1295
1194cpython_re = re.compile(r"^python(\d+\.\d+)$") 1296cpython_ABI_re = re.compile(r"^(\d+\.\d+)$")
1297jython_ABI_re = re.compile(r"^(\d+\.\d+)-jython$")
1298pypy_ABI_re = re.compile(r"^\d+\.\d+-pypy-(\d+\.\d+)$")
1299cpython_interpreter_re = re.compile(r"^python(\d+\.\d+)$")
1195jython_re = re.compile(r"^jython(\d+\.\d+)$") 1300jython_interpreter_re = re.compile(r"^jython(\d+\.\d+)$")
1196pypy_re = re.compile(r"^pypy-c(\d+\.\d+)$") 1301pypy_interpreter_re = re.compile(r"^pypy-c(\d+\.\d+)$")
1197python_shebang_re = re.compile(r"^#! *(${EPREFIX}/usr/bin/python|(${EPREFIX})?/usr/bin/env +(${EPREFIX}/usr/bin/)?python)") 1302cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPREFIX})?/usr/bin/env[ \t]+(?:${EPREFIX}/usr/bin/)?python)")
1303python_shebang_options_re = re.compile(r"^#![ \t]*${EPREFIX}/usr/bin/(?:jython|pypy-c|python)(?:\d+(?:\.\d+)?)?[ \t]+(-\S)")
1198python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$") 1304python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
1199 1305
1200pypy_versions_mapping = { 1306pypy_versions_mapping = {
1201 "1.5": "2.7" 1307 "1.5": "2.7"
1202} 1308}
1203 1309
1204def get_PYTHON_ABI(EPYTHON): 1310def get_PYTHON_ABI(python_interpreter):
1205 cpython_matched = cpython_re.match(EPYTHON) 1311 cpython_matched = cpython_interpreter_re.match(python_interpreter)
1206 jython_matched = jython_re.match(EPYTHON) 1312 jython_matched = jython_interpreter_re.match(python_interpreter)
1207 pypy_matched = pypy_re.match(EPYTHON) 1313 pypy_matched = pypy_interpreter_re.match(python_interpreter)
1208 if cpython_matched is not None: 1314 if cpython_matched is not None:
1209 PYTHON_ABI = cpython_matched.group(1) 1315 PYTHON_ABI = cpython_matched.group(1)
1210 elif jython_matched is not None: 1316 elif jython_matched is not None:
1211 PYTHON_ABI = jython_matched.group(1) + "-jython" 1317 PYTHON_ABI = jython_matched.group(1) + "-jython"
1212 elif pypy_matched is not None: 1318 elif pypy_matched is not None:
1213 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1) 1319 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
1214 else: 1320 else:
1215 PYTHON_ABI = None 1321 PYTHON_ABI = None
1216 return PYTHON_ABI 1322 return PYTHON_ABI
1217 1323
1324def get_python_interpreter(PYTHON_ABI):
1325 cpython_matched = cpython_ABI_re.match(PYTHON_ABI)
1326 jython_matched = jython_ABI_re.match(PYTHON_ABI)
1327 pypy_matched = pypy_ABI_re.match(PYTHON_ABI)
1328 if cpython_matched is not None:
1329 python_interpreter = "python" + cpython_matched.group(1)
1330 elif jython_matched is not None:
1331 python_interpreter = "jython" + jython_matched.group(1)
1332 elif pypy_matched is not None:
1333 python_interpreter = "pypy-c" + pypy_matched.group(1)
1334 else:
1335 python_interpreter = None
1336 return python_interpreter
1337
1218EOF 1338EOF
1219 if [[ "$?" != "0" ]]; then 1339 if [[ "$?" != "0" ]]; then
1220 die "${FUNCNAME}(): Generation of '$1' failed" 1340 die "${FUNCNAME}(): Generation of '$1' failed"
1221 fi 1341 fi
1222 if [[ "${respect_EPYTHON}" == "1" ]]; then 1342 if [[ "${respect_EPYTHON}" == "1" ]]; then
1223 cat << EOF >> "${file}" 1343 cat << EOF >> "${file}"
1224EPYTHON = os.environ.get("EPYTHON") 1344python_interpreter = os.environ.get("EPYTHON")
1225if EPYTHON: 1345if python_interpreter:
1226 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1346 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1227 if PYTHON_ABI is None: 1347 if PYTHON_ABI is None:
1228 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1348 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1229 sys.exit(1) 1349 sys.exit(1)
1230else: 1350else:
1231 try: 1351 try:
1232 environment = os.environ.copy() 1352 environment = os.environ.copy()
1233 environment["ROOT"] = "/" 1353 environment["ROOT"] = "/"
1236 raise ValueError 1356 raise ValueError
1237 except (OSError, ValueError): 1357 except (OSError, ValueError):
1238 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1358 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1239 sys.exit(1) 1359 sys.exit(1)
1240 1360
1241 EPYTHON = eselect_process.stdout.read() 1361 python_interpreter = eselect_process.stdout.read()
1242 if not isinstance(EPYTHON, str): 1362 if not isinstance(python_interpreter, str):
1243 # Python 3 1363 # Python 3
1244 EPYTHON = EPYTHON.decode() 1364 python_interpreter = python_interpreter.decode()
1245 EPYTHON = EPYTHON.rstrip("\n") 1365 python_interpreter = python_interpreter.rstrip("\n")
1246 1366
1247 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1367 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1248 if PYTHON_ABI is None: 1368 if PYTHON_ABI is None:
1249 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1369 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1250 sys.exit(1) 1370 sys.exit(1)
1251 1371
1252wrapper_script_path = os.path.realpath(sys.argv[0]) 1372wrapper_script_path = os.path.realpath(sys.argv[0])
1253target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1373target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1254if not os.path.exists(target_executable_path): 1374if not os.path.exists(target_executable_path):
1268 raise ValueError 1388 raise ValueError
1269except (OSError, ValueError): 1389except (OSError, ValueError):
1270 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0]) 1390 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1271 sys.exit(1) 1391 sys.exit(1)
1272 1392
1273EPYTHON = eselect_process.stdout.read() 1393python_interpreter = eselect_process.stdout.read()
1274if not isinstance(EPYTHON, str): 1394if not isinstance(python_interpreter, str):
1275 # Python 3 1395 # Python 3
1276 EPYTHON = EPYTHON.decode() 1396 python_interpreter = python_interpreter.decode()
1277EPYTHON = EPYTHON.rstrip("\n") 1397python_interpreter = python_interpreter.rstrip("\n")
1278 1398
1279PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1399PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1280if PYTHON_ABI is None: 1400if PYTHON_ABI is None:
1281 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], EPYTHON)) 1401 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1282 sys.exit(1) 1402 sys.exit(1)
1283 1403
1284wrapper_script_path = os.path.realpath(sys.argv[0]) 1404wrapper_script_path = os.path.realpath(sys.argv[0])
1285for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]: 1405for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]:
1286 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1406 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1287 if os.path.exists(target_executable_path): 1407 if os.path.exists(target_executable_path):
1288 break 1408 break
1289else: 1409else:
1290 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path)) 1410 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path))
1291 sys.exit(1) 1411 sys.exit(1)
1412
1413python_interpreter = get_python_interpreter(PYTHON_ABI)
1414if python_interpreter is None:
1415 sys.stderr.write("%s: Unrecognized Python ABI '%s'\n" % (sys.argv[0], PYTHON_ABI))
1416 sys.exit(1)
1292EOF 1417EOF
1293 if [[ "$?" != "0" ]]; then 1418 if [[ "$?" != "0" ]]; then
1294 die "${FUNCNAME}(): Generation of '$1' failed" 1419 die "${FUNCNAME}(): Generation of '$1' failed"
1295 fi 1420 fi
1296 fi 1421 fi
1297 cat << EOF >> "${file}" 1422 cat << EOF >> "${file}"
1298 1423
1299target_executable = open(target_executable_path, "rb") 1424target_executable = open(target_executable_path, "rb")
1300target_executable_first_line = target_executable.readline() 1425target_executable_first_line = target_executable.readline()
1426target_executable.close()
1301if not isinstance(target_executable_first_line, str): 1427if not isinstance(target_executable_first_line, str):
1302 # Python 3 1428 # Python 3
1303 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace") 1429 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace")
1304 1430
1431options = []
1432python_shebang_options_matched = python_shebang_options_re.match(target_executable_first_line)
1433if python_shebang_options_matched is not None:
1434 options = [python_shebang_options_matched.group(1)]
1435
1305python_shebang_matched = python_shebang_re.match(target_executable_first_line) 1436cpython_shebang_matched = cpython_shebang_re.match(target_executable_first_line)
1306target_executable.close()
1307 1437
1308if python_shebang_matched is not None: 1438if cpython_shebang_matched is not None:
1309 try: 1439 try:
1310 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % EPYTHON 1440 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % python_interpreter
1311 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1" 1441 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1"
1312 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE) 1442 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE)
1313 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] 1443 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"]
1314 if python_verification_process.wait() != 0: 1444 if python_verification_process.wait() != 0:
1315 raise ValueError 1445 raise ValueError
1320 python_verification_output = python_verification_output.decode() 1450 python_verification_output = python_verification_output.decode()
1321 1451
1322 if not python_verification_output_re.match(python_verification_output): 1452 if not python_verification_output_re.match(python_verification_output):
1323 raise ValueError 1453 raise ValueError
1324 1454
1325 if cpython_re.match(EPYTHON) is not None: 1455 if cpython_interpreter_re.match(python_interpreter) is not None:
1326 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0]) 1456 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0])
1327 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0] 1457 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0]
1328 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path 1458 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path
1329 1459
1330 if hasattr(os, "execv"): 1460 if hasattr(os, "execv"):
1331 os.execv(python_interpreter_path, [python_interpreter_path] + sys.argv) 1461 os.execv(python_interpreter_path, [python_interpreter_path] + options + sys.argv)
1332 else: 1462 else:
1333 sys.exit(subprocess.Popen([python_interpreter_path] + sys.argv).wait()) 1463 sys.exit(subprocess.Popen([python_interpreter_path] + options + sys.argv).wait())
1334 except (KeyboardInterrupt, SystemExit): 1464 except (KeyboardInterrupt, SystemExit):
1335 raise 1465 raise
1336 except: 1466 except:
1337 pass 1467 pass
1338 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"): 1468 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"):
1522 fi 1652 fi
1523 done 1653 done
1524 1654
1525 popd > /dev/null || die "popd failed" 1655 popd > /dev/null || die "popd failed"
1526 1656
1657 # This is per bug #390691, without the duplication refactor, and with
1658 # the 3-way structure per comment #6. This enable users with old
1659 # coreutils to upgrade a lot easier (you need to upgrade python+portage
1660 # before coreutils can be upgraded).
1661 if ROOT="/" has_version '>=sys-apps/coreutils-6.9.90'; then
1662 cp -fr --preserve=all --no-preserve=context "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1527 if ROOT="/" has_version sys-apps/coreutils; then 1663 elif ROOT="/" has_version sys-apps/coreutils; then
1528 cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" 1664 cp -fr --preserve=all "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1529 else 1665 else
1530 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" 1666 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1531 fi 1667 fi
1532 done 1668 done
1551 stdout = sys.stdout.buffer 1687 stdout = sys.stdout.buffer
1552else: 1688else:
1553 # Python 2 1689 # Python 2
1554 stdout = sys.stdout 1690 stdout = sys.stdout
1555 1691
1692python_wrapper_scripts_file = open('${T}/python_wrapper_scripts', 'rb')
1556files = set(open('${T}/python_wrapper_scripts', 'rb').read().rstrip(${b}'\x00').split(${b}'\x00')) 1693files = set(python_wrapper_scripts_file.read().rstrip(${b}'\x00').split(${b}'\x00'))
1694python_wrapper_scripts_file.close()
1557 1695
1558for file in sorted(files): 1696for file in sorted(files):
1559 stdout.write(file) 1697 stdout.write(file)
1560 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts") 1698 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts")
1561 1699
1626 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable. 1764 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable.
1627 PYTHON_REQUESTED_ACTIVE_VERSION="$1" 1765 PYTHON_REQUESTED_ACTIVE_VERSION="$1"
1628} 1766}
1629 1767
1630# @FUNCTION: python_need_rebuild 1768# @FUNCTION: python_need_rebuild
1769# @DESCRIPTION:
1631# @DESCRIPTION: Mark current package for rebuilding by python-updater after 1770# Mark current package for rebuilding by python-updater after
1632# switching of active version of Python. 1771# switching of active version of Python.
1633python_need_rebuild() { 1772python_need_rebuild() {
1634 if _python_package_supporting_installation_for_multiple_python_abis; then 1773 if _python_package_supporting_installation_for_multiple_python_abis; then
1635 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs" 1774 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
1636 fi 1775 fi
2335_python_test_hook() { 2474_python_test_hook() {
2336 if [[ "$#" -ne 1 ]]; then 2475 if [[ "$#" -ne 1 ]]; then
2337 die "${FUNCNAME}() requires 1 argument" 2476 die "${FUNCNAME}() requires 1 argument"
2338 fi 2477 fi
2339 2478
2340 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${FUNCNAME[3]}_$1_hook")" == "function" ]]; then 2479 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${_PYTHON_TEST_FUNCTION}_$1_hook")" == "function" ]]; then
2341 "${FUNCNAME[3]}_$1_hook" 2480 "${_PYTHON_TEST_FUNCTION}_$1_hook"
2342 fi 2481 fi
2343} 2482}
2344 2483
2345# @FUNCTION: python_execute_nosetests 2484# @FUNCTION: python_execute_nosetests
2346# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments] 2485# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
2380 python_test_function() { 2519 python_test_function() {
2381 local evaluated_PYTHONPATH 2520 local evaluated_PYTHONPATH
2382 2521
2383 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2522 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2384 2523
2385 _python_test_hook pre 2524 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook pre
2386 2525
2387 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2526 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2388 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2527 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2389 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2528 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2390 else 2529 else
2391 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2530 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2392 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2531 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2393 fi 2532 fi
2394 2533
2395 _python_test_hook post 2534 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook post
2396 } 2535 }
2397 if _python_package_supporting_installation_for_multiple_python_abis; then 2536 if _python_package_supporting_installation_for_multiple_python_abis; then
2398 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2537 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2399 else 2538 else
2400 if [[ -n "${separate_build_dirs}" ]]; then 2539 if [[ -n "${separate_build_dirs}" ]]; then
2444 python_test_function() { 2583 python_test_function() {
2445 local evaluated_PYTHONPATH 2584 local evaluated_PYTHONPATH
2446 2585
2447 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2586 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2448 2587
2449 _python_test_hook pre 2588 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook pre
2450 2589
2451 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2590 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2452 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL} 2591 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL}
2453 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?" 2592 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?"
2454 else 2593 else
2455 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL} 2594 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL}
2456 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?" 2595 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?"
2457 fi 2596 fi
2458 2597
2459 _python_test_hook post 2598 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook post
2460 } 2599 }
2461 if _python_package_supporting_installation_for_multiple_python_abis; then 2600 if _python_package_supporting_installation_for_multiple_python_abis; then
2462 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2601 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2463 else 2602 else
2464 if [[ -n "${separate_build_dirs}" ]]; then 2603 if [[ -n "${separate_build_dirs}" ]]; then
2508 python_test_function() { 2647 python_test_function() {
2509 local evaluated_PYTHONPATH 2648 local evaluated_PYTHONPATH
2510 2649
2511 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2650 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2512 2651
2513 _python_test_hook pre 2652 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook pre
2514 2653
2515 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2654 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2516 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2655 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2517 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2656 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2518 else 2657 else
2519 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2658 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2520 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2659 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2521 fi 2660 fi
2522 2661
2523 _python_test_hook post 2662 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook post
2524 } 2663 }
2525 if _python_package_supporting_installation_for_multiple_python_abis; then 2664 if _python_package_supporting_installation_for_multiple_python_abis; then
2526 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2665 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2527 else 2666 else
2528 if [[ -n "${separate_build_dirs}" ]]; then 2667 if [[ -n "${separate_build_dirs}" ]]; then
2787 done 2926 done
2788 for dir in "${evaluated_dirs[@]}"; do 2927 for dir in "${evaluated_dirs[@]}"; do
2789 eval "dirs+=(\"\${root}${dir}\")" 2928 eval "dirs+=(\"\${root}${dir}\")"
2790 done 2929 done
2791 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1" 2930 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
2792 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2931 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2793 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1" 2932 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
2794 fi 2933 fi
2795 _python_clean_compiled_modules "${dirs[@]}" 2934 _python_clean_compiled_modules "${dirs[@]}"
2796 fi 2935 fi
2797 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then 2936 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then
2800 done 2939 done
2801 for file in "${evaluated_files[@]}"; do 2940 for file in "${evaluated_files[@]}"; do
2802 eval "files+=(\"\${root}${file}\")" 2941 eval "files+=(\"\${root}${file}\")"
2803 done 2942 done
2804 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1" 2943 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1"
2805 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2944 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2806 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1" 2945 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1"
2807 fi 2946 fi
2808 _python_clean_compiled_modules "${files[@]}" 2947 _python_clean_compiled_modules "${files[@]}"
2809 fi 2948 fi
2810 eend "${return_code}" 2949 eend "${return_code}"
2831 return_code="0" 2970 return_code="0"
2832 stderr="" 2971 stderr=""
2833 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)" 2972 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)"
2834 if ((${#other_dirs[@]})); then 2973 if ((${#other_dirs[@]})); then
2835 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1" 2974 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1"
2836 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2975 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2837 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1" 2976 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
2838 fi 2977 fi
2839 _python_clean_compiled_modules "${other_dirs[@]}" 2978 _python_clean_compiled_modules "${other_dirs[@]}"
2840 fi 2979 fi
2841 if ((${#other_files[@]})); then 2980 if ((${#other_files[@]})); then
2842 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1" 2981 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1"
2843 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2982 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2844 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1" 2983 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1"
2845 fi 2984 fi
2846 _python_clean_compiled_modules "${other_files[@]}" 2985 _python_clean_compiled_modules "${other_files[@]}"
2847 fi 2986 fi
2848 eend "${return_code}" 2987 eend "${return_code}"
3035} 3174}
3036 3175
3037# ================================================================================================ 3176# ================================================================================================
3038# ===================================== DEPRECATED FUNCTIONS ===================================== 3177# ===================================== DEPRECATED FUNCTIONS =====================================
3039# ================================================================================================ 3178# ================================================================================================
3179
3180fi # _PYTHON_ECLASS_INHERITED

Legend:
Removed from v.1.128  
changed lines
  Added in v.1.152

  ViewVC Help
Powered by ViewVC 1.1.20