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

Diff of /eclass/python.eclass

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

Revision 1.122 Revision 1.139
1# Copyright 1999-2011 Gentoo Foundation 1# Copyright 1999-2011 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.122 2011/07/08 07:43:38 djc Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.139 2011/10/15 20:58:08 phajdan.jr 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
12inherit multilib 12inherit multilib
13 13
14if ! has "${EAPI:-0}" 0 1 2 3; then 14if ! has "${EAPI:-0}" 0 1 2 3 4; then
15 die "API of python.eclass in EAPI=\"${EAPI}\" not established" 15 die "API of python.eclass in EAPI=\"${EAPI}\" not established"
16fi 16fi
17 17
18_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7) 18_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
19_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.0 3.1 3.2 3.3) 19_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
20_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython) 20_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
21_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.5)
21_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]}) 22_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
22 23
23# ================================================================================================ 24# ================================================================================================
24# ===================================== HANDLING OF METADATA ===================================== 25# ===================================== HANDLING OF METADATA =====================================
25# ================================================================================================ 26# ================================================================================================
26 27
… …
58 pattern="$2" 59 pattern="$2"
59 60
60 if [[ "${pattern}" == *"-cpython" ]]; then 61 if [[ "${pattern}" == *"-cpython" ]]; then
61 [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ && "${PYTHON_ABI}" == ${pattern%-cpython} ]] 62 [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ && "${PYTHON_ABI}" == ${pattern%-cpython} ]]
62 elif [[ "${pattern}" == *"-jython" ]]; then 63 elif [[ "${pattern}" == *"-jython" ]]; then
64 [[ "${PYTHON_ABI}" == ${pattern} ]]
65 elif [[ "${pattern}" == *"-pypy-"* ]]; then
63 [[ "${PYTHON_ABI}" == ${pattern} ]] 66 [[ "${PYTHON_ABI}" == ${pattern} ]]
64 else 67 else
65 if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then 68 if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then
66 [[ "${PYTHON_ABI}" == ${pattern} ]] 69 [[ "${PYTHON_ABI}" == ${pattern} ]]
67 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then 70 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then
68 [[ "${PYTHON_ABI%-jython}" == ${pattern} ]] 71 [[ "${PYTHON_ABI%-jython}" == ${pattern} ]]
72 elif [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-pypy-[[:digit:]]+\.[[:digit:]]+$ ]]; then
73 [[ "${PYTHON_ABI%-pypy-*}" == ${pattern} ]]
69 else 74 else
70 die "${FUNCNAME}(): Unrecognized Python ABI '${PYTHON_ABI}'" 75 die "${FUNCNAME}(): Unrecognized Python ABI '${PYTHON_ABI}'"
71 fi 76 fi
72 fi 77 fi
73 else 78 else
… …
292_python_implementation() { 297_python_implementation() {
293 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then 298 if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then
294 return 0 299 return 0
295 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then 300 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then
296 return 0 301 return 0
302 elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then
303 return 0
297 else 304 else
298 return 1 305 return 1
299 fi 306 fi
300} 307}
301 308
… …
460 467
461if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then 468if ! has "${EAPI:-0}" 0 1 2 3 || { has "${EAPI:-0}" 2 3 && [[ -n "${PYTHON_USE_WITH}" || -n "${PYTHON_USE_WITH_OR}" ]]; }; then
462 EXPORT_FUNCTIONS pkg_setup 469 EXPORT_FUNCTIONS pkg_setup
463fi 470fi
464 471
465_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|python)' 472_PYTHON_SHEBANG_BASE_PART_REGEX='^#![[:space:]]*([^[:space:]]*/usr/bin/env[[:space:]]+)?([^[:space:]]*/)?(jython|pypy-c|python)'
466 473
467# @FUNCTION: python_convert_shebangs 474# @FUNCTION: python_convert_shebangs
468# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories] 475# @USAGE: [-q|--quiet] [-r|--recursive] [-x|--only-executables] [--] <Python_ABI|Python_version> <file|directory> [files|directories]
469# @DESCRIPTION: 476# @DESCRIPTION:
470# Convert shebangs in specified files. Directories can be specified only with --recursive option. 477# Convert shebangs in specified files. Directories can be specified only with --recursive option.
… …
538 545
539 if [[ "${quiet}" == "0" ]]; then 546 if [[ "${quiet}" == "0" ]]; then
540 einfo "Converting shebang in '${file}'" 547 einfo "Converting shebang in '${file}'"
541 fi 548 fi
542 549
543 sed -e "1s:^#![[:space:]]*\([^[:space:]]*/usr/bin/env[[:space:]]\)\?[[:space:]]*\([^[:space:]]*/\)\?\(jython\|python\)\([[:digit:]]\+\(\.[[:digit:]]\+\)\?\)\?\(\$\|[[:space:]].*\):#!\1\2${python_interpreter}\6:" -i "${file}" || die "Conversion of shebang in '${file}' failed" 550 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"
544 fi 551 fi
545 done 552 done
546} 553}
547 554
548# @FUNCTION: python_clean_installation_image 555# @FUNCTION: python_clean_installation_image
… …
998 iterated_PYTHON_ABIS="${PYTHON_ABIS}" 1005 iterated_PYTHON_ABIS="${PYTHON_ABIS}"
999 fi 1006 fi
1000 for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do 1007 for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do
1001 if [[ "${EBUILD_PHASE}" == "test" ]] && _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${PYTHON_TESTS_RESTRICTED_ABIS}"; then 1008 if [[ "${EBUILD_PHASE}" == "test" ]] && _python_check_python_abi_matching --patterns-list "${PYTHON_ABI}" "${PYTHON_TESTS_RESTRICTED_ABIS}"; then
1002 if [[ "${quiet}" == "0" ]]; then 1009 if [[ "${quiet}" == "0" ]]; then
1003 echo " ${_GREEN}*${_NORMAL} ${_BLUE}Testing of ${CATEGORY}/${PF} with $(python_get_implementation) $(python_get_version) skipped${_NORMAL}" 1010 echo " ${_GREEN}*${_NORMAL} ${_BLUE}Testing of ${CATEGORY}/${PF} with $(python_get_implementation_and_version) skipped${_NORMAL}"
1004 fi 1011 fi
1005 continue 1012 continue
1006 fi 1013 fi
1007 1014
1008 _python_prepare_flags 1015 _python_prepare_flags
1009 1016
1010 if [[ "${quiet}" == "0" ]]; then 1017 if [[ "${quiet}" == "0" ]]; then
1011 if [[ -n "${action_message_template}" ]]; then 1018 if [[ -n "${action_message_template}" ]]; then
1012 eval "action_message=\"${action_message_template}\"" 1019 eval "action_message=\"${action_message_template}\""
1013 else 1020 else
1014 action_message="${action} of ${CATEGORY}/${PF} with $(python_get_implementation) $(python_get_version)..." 1021 action_message="${action} of ${CATEGORY}/${PF} with $(python_get_implementation_and_version)..."
1015 fi 1022 fi
1016 echo " ${_GREEN}*${_NORMAL} ${_BLUE}${action_message}${_NORMAL}" 1023 echo " ${_GREEN}*${_NORMAL} ${_BLUE}${action_message}${_NORMAL}"
1017 fi 1024 fi
1018 1025
1019 if [[ "${separate_build_dirs}" == "1" ]]; then 1026 if [[ "${separate_build_dirs}" == "1" ]]; then
… …
1043 1050
1044 if [[ "${return_code}" -ne 0 ]]; then 1051 if [[ "${return_code}" -ne 0 ]]; then
1045 if [[ -n "${failure_message_template}" ]]; then 1052 if [[ -n "${failure_message_template}" ]]; then
1046 eval "failure_message=\"${failure_message_template}\"" 1053 eval "failure_message=\"${failure_message_template}\""
1047 else 1054 else
1048 failure_message="${action} failed with $(python_get_implementation) $(python_get_version) in ${function}() function" 1055 failure_message="${action} failed with $(python_get_implementation_and_version) in ${function}() function"
1049 fi 1056 fi
1050 1057
1051 if [[ "${nonfatal}" == "1" ]]; then 1058 if [[ "${nonfatal}" == "1" ]]; then
1052 if [[ "${quiet}" == "0" ]]; then 1059 if [[ "${quiet}" == "0" ]]; then
1053 ewarn "${failure_message}" 1060 ewarn "${failure_message}"
… …
1224import os 1231import os
1225import re 1232import re
1226import subprocess 1233import subprocess
1227import sys 1234import sys
1228 1235
1229cpython_re = re.compile(r"^python(\d+\.\d+)$") 1236cpython_ABI_re = re.compile(r"^(\d+\.\d+)$")
1237jython_ABI_re = re.compile(r"^(\d+\.\d+)-jython$")
1238pypy_ABI_re = re.compile(r"^\d+\.\d+-pypy-(\d+\.\d+)$")
1239cpython_interpreter_re = re.compile(r"^python(\d+\.\d+)$")
1230jython_re = re.compile(r"^jython(\d+\.\d+)$") 1240jython_interpreter_re = re.compile(r"^jython(\d+\.\d+)$")
1241pypy_interpreter_re = re.compile(r"^pypy-c(\d+\.\d+)$")
1231python_shebang_re = re.compile(r"^#! *(${EPREFIX}/usr/bin/python|(${EPREFIX})?/usr/bin/env +(${EPREFIX}/usr/bin/)?python)") 1242cpython_shebang_re = re.compile(r"^#![ \t]*(?:${EPREFIX}/usr/bin/python|(?:${EPREFIX})?/usr/bin/env[ \t]+(?:${EPREFIX}/usr/bin/)?python)")
1243python_shebang_options_re = re.compile(r"^#![ \t]*${EPREFIX}/usr/bin/(?:jython|pypy-c|python)(?:\d+(?:\.\d+)?)?[ \t]+(-\S)")
1232python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$") 1244python_verification_output_re = re.compile("^GENTOO_PYTHON_TARGET_SCRIPT_PATH supported\n$")
1233 1245
1234def get_PYTHON_ABI(EPYTHON): 1246pypy_versions_mapping = {
1235 cpython_matched = cpython_re.match(EPYTHON) 1247 "1.5": "2.7"
1236 jython_matched = jython_re.match(EPYTHON) 1248}
1249
1250def get_PYTHON_ABI(python_interpreter):
1251 cpython_matched = cpython_interpreter_re.match(python_interpreter)
1252 jython_matched = jython_interpreter_re.match(python_interpreter)
1253 pypy_matched = pypy_interpreter_re.match(python_interpreter)
1237 if cpython_matched is not None: 1254 if cpython_matched is not None:
1238 PYTHON_ABI = cpython_matched.group(1) 1255 PYTHON_ABI = cpython_matched.group(1)
1239 elif jython_matched is not None: 1256 elif jython_matched is not None:
1240 PYTHON_ABI = jython_matched.group(1) + "-jython" 1257 PYTHON_ABI = jython_matched.group(1) + "-jython"
1258 elif pypy_matched is not None:
1259 PYTHON_ABI = pypy_versions_mapping[pypy_matched.group(1)] + "-pypy-" + pypy_matched.group(1)
1241 else: 1260 else:
1242 PYTHON_ABI = None 1261 PYTHON_ABI = None
1243 return PYTHON_ABI 1262 return PYTHON_ABI
1244 1263
1264def get_python_interpreter(PYTHON_ABI):
1265 cpython_matched = cpython_ABI_re.match(PYTHON_ABI)
1266 jython_matched = jython_ABI_re.match(PYTHON_ABI)
1267 pypy_matched = pypy_ABI_re.match(PYTHON_ABI)
1268 if cpython_matched is not None:
1269 python_interpreter = "python" + cpython_matched.group(1)
1270 elif jython_matched is not None:
1271 python_interpreter = "jython" + jython_matched.group(1)
1272 elif pypy_matched is not None:
1273 python_interpreter = "pypy-c" + pypy_matched.group(1)
1274 else:
1275 python_interpreter = None
1276 return python_interpreter
1277
1245EOF 1278EOF
1246 if [[ "$?" != "0" ]]; then 1279 if [[ "$?" != "0" ]]; then
1247 die "${FUNCNAME}(): Generation of '$1' failed" 1280 die "${FUNCNAME}(): Generation of '$1' failed"
1248 fi 1281 fi
1249 if [[ "${respect_EPYTHON}" == "1" ]]; then 1282 if [[ "${respect_EPYTHON}" == "1" ]]; then
1250 cat << EOF >> "${file}" 1283 cat << EOF >> "${file}"
1251EPYTHON = os.environ.get("EPYTHON") 1284python_interpreter = os.environ.get("EPYTHON")
1252if EPYTHON: 1285if python_interpreter:
1253 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1286 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1254 if PYTHON_ABI is None: 1287 if PYTHON_ABI is None:
1255 sys.stderr.write("EPYTHON variable has unrecognized value '%s'\n" % EPYTHON) 1288 sys.stderr.write("%s: EPYTHON variable has unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1256 sys.exit(1) 1289 sys.exit(1)
1257else: 1290else:
1258 try: 1291 try:
1259 environment = os.environ.copy() 1292 environment = os.environ.copy()
1260 environment["ROOT"] = "/" 1293 environment["ROOT"] = "/"
1261 eselect_process = subprocess.Popen(["${EPREFIX}/usr/bin/eselect", "python", "show"${eselect_python_option:+, $(echo "\"")}${eselect_python_option}${eselect_python_option:+$(echo "\"")}], env=environment, stdout=subprocess.PIPE) 1294 eselect_process = subprocess.Popen(["${EPREFIX}/usr/bin/eselect", "python", "show"${eselect_python_option:+, $(echo "\"")}${eselect_python_option}${eselect_python_option:+$(echo "\"")}], env=environment, stdout=subprocess.PIPE)
1262 if eselect_process.wait() != 0: 1295 if eselect_process.wait() != 0:
1263 raise ValueError 1296 raise ValueError
1264 except (OSError, ValueError): 1297 except (OSError, ValueError):
1265 sys.stderr.write("Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n") 1298 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1266 sys.exit(1) 1299 sys.exit(1)
1267 1300
1268 EPYTHON = eselect_process.stdout.read() 1301 python_interpreter = eselect_process.stdout.read()
1269 if not isinstance(EPYTHON, str): 1302 if not isinstance(python_interpreter, str):
1270 # Python 3 1303 # Python 3
1271 EPYTHON = EPYTHON.decode() 1304 python_interpreter = python_interpreter.decode()
1272 EPYTHON = EPYTHON.rstrip("\n") 1305 python_interpreter = python_interpreter.rstrip("\n")
1273 1306
1274 PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1307 PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1275 if PYTHON_ABI is None: 1308 if PYTHON_ABI is None:
1276 sys.stderr.write("'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % EPYTHON) 1309 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1277 sys.exit(1) 1310 sys.exit(1)
1278 1311
1279wrapper_script_path = os.path.realpath(sys.argv[0]) 1312wrapper_script_path = os.path.realpath(sys.argv[0])
1280target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1313target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1281if not os.path.exists(target_executable_path): 1314if not os.path.exists(target_executable_path):
1282 sys.stderr.write("'%s' does not exist\n" % target_executable_path) 1315 sys.stderr.write("%s: '%s' does not exist\n" % (sys.argv[0], target_executable_path))
1283 sys.exit(1) 1316 sys.exit(1)
1284EOF 1317EOF
1285 if [[ "$?" != "0" ]]; then 1318 if [[ "$?" != "0" ]]; then
1286 die "${FUNCNAME}(): Generation of '$1' failed" 1319 die "${FUNCNAME}(): Generation of '$1' failed"
1287 fi 1320 fi
… …
1292 environment["ROOT"] = "/" 1325 environment["ROOT"] = "/"
1293 eselect_process = subprocess.Popen(["${EPREFIX}/usr/bin/eselect", "python", "show"${eselect_python_option:+, $(echo "\"")}${eselect_python_option}${eselect_python_option:+$(echo "\"")}], env=environment, stdout=subprocess.PIPE) 1326 eselect_process = subprocess.Popen(["${EPREFIX}/usr/bin/eselect", "python", "show"${eselect_python_option:+, $(echo "\"")}${eselect_python_option}${eselect_python_option:+$(echo "\"")}], env=environment, stdout=subprocess.PIPE)
1294 if eselect_process.wait() != 0: 1327 if eselect_process.wait() != 0:
1295 raise ValueError 1328 raise ValueError
1296except (OSError, ValueError): 1329except (OSError, ValueError):
1297 sys.stderr.write("Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n") 1330 sys.stderr.write("%s: Execution of 'eselect python show${eselect_python_option:+ }${eselect_python_option}' failed\n" % sys.argv[0])
1298 sys.exit(1) 1331 sys.exit(1)
1299 1332
1300EPYTHON = eselect_process.stdout.read() 1333python_interpreter = eselect_process.stdout.read()
1301if not isinstance(EPYTHON, str): 1334if not isinstance(python_interpreter, str):
1302 # Python 3 1335 # Python 3
1303 EPYTHON = EPYTHON.decode() 1336 python_interpreter = python_interpreter.decode()
1304EPYTHON = EPYTHON.rstrip("\n") 1337python_interpreter = python_interpreter.rstrip("\n")
1305 1338
1306PYTHON_ABI = get_PYTHON_ABI(EPYTHON) 1339PYTHON_ABI = get_PYTHON_ABI(python_interpreter)
1307if PYTHON_ABI is None: 1340if PYTHON_ABI is None:
1308 sys.stderr.write("'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % EPYTHON) 1341 sys.stderr.write("%s: 'eselect python show${eselect_python_option:+ }${eselect_python_option}' printed unrecognized value '%s'\n" % (sys.argv[0], python_interpreter))
1309 sys.exit(1) 1342 sys.exit(1)
1310 1343
1311wrapper_script_path = os.path.realpath(sys.argv[0]) 1344wrapper_script_path = os.path.realpath(sys.argv[0])
1312for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]: 1345for PYTHON_ABI in [PYTHON_ABI, ${PYTHON_ABIS_list}]:
1313 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI) 1346 target_executable_path = "%s-%s" % (wrapper_script_path, PYTHON_ABI)
1314 if os.path.exists(target_executable_path): 1347 if os.path.exists(target_executable_path):
1315 break 1348 break
1316else: 1349else:
1317 sys.stderr.write("No target script exists for '%s'\n" % wrapper_script_path) 1350 sys.stderr.write("%s: No target script exists for '%s'\n" % (sys.argv[0], wrapper_script_path))
1351 sys.exit(1)
1352
1353python_interpreter = get_python_interpreter(PYTHON_ABI)
1354if python_interpreter is None:
1355 sys.stderr.write("%s: Unrecognized Python ABI '%s'\n" % (sys.argv[0], PYTHON_ABI))
1318 sys.exit(1) 1356 sys.exit(1)
1319EOF 1357EOF
1320 if [[ "$?" != "0" ]]; then 1358 if [[ "$?" != "0" ]]; then
1321 die "${FUNCNAME}(): Generation of '$1' failed" 1359 die "${FUNCNAME}(): Generation of '$1' failed"
1322 fi 1360 fi
1323 fi 1361 fi
1324 cat << EOF >> "${file}" 1362 cat << EOF >> "${file}"
1325 1363
1326target_executable = open(target_executable_path, "rb") 1364target_executable = open(target_executable_path, "rb")
1327target_executable_first_line = target_executable.readline() 1365target_executable_first_line = target_executable.readline()
1366target_executable.close()
1328if not isinstance(target_executable_first_line, str): 1367if not isinstance(target_executable_first_line, str):
1329 # Python 3 1368 # Python 3
1330 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace") 1369 target_executable_first_line = target_executable_first_line.decode("utf_8", "replace")
1331 1370
1371options = []
1372python_shebang_options_matched = python_shebang_options_re.match(target_executable_first_line)
1373if python_shebang_options_matched is not None:
1374 options = [python_shebang_options_matched.group(1)]
1375
1332python_shebang_matched = python_shebang_re.match(target_executable_first_line) 1376cpython_shebang_matched = cpython_shebang_re.match(target_executable_first_line)
1333target_executable.close()
1334 1377
1335if python_shebang_matched is not None: 1378if cpython_shebang_matched is not None:
1336 try: 1379 try:
1337 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % EPYTHON 1380 python_interpreter_path = "${EPREFIX}/usr/bin/%s" % python_interpreter
1338 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1" 1381 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] = "1"
1339 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE) 1382 python_verification_process = subprocess.Popen([python_interpreter_path, "-c", "pass"], stdout=subprocess.PIPE)
1340 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"] 1383 del os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"]
1341 if python_verification_process.wait() != 0: 1384 if python_verification_process.wait() != 0:
1342 raise ValueError 1385 raise ValueError
… …
1347 python_verification_output = python_verification_output.decode() 1390 python_verification_output = python_verification_output.decode()
1348 1391
1349 if not python_verification_output_re.match(python_verification_output): 1392 if not python_verification_output_re.match(python_verification_output):
1350 raise ValueError 1393 raise ValueError
1351 1394
1352 if cpython_re.match(EPYTHON) is not None: 1395 if cpython_interpreter_re.match(python_interpreter) is not None:
1353 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0]) 1396 os.environ["GENTOO_PYTHON_PROCESS_NAME"] = os.path.basename(sys.argv[0])
1354 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0] 1397 os.environ["GENTOO_PYTHON_WRAPPER_SCRIPT_PATH"] = sys.argv[0]
1355 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path 1398 os.environ["GENTOO_PYTHON_TARGET_SCRIPT_PATH"] = target_executable_path
1356 1399
1357 if hasattr(os, "execv"): 1400 if hasattr(os, "execv"):
1358 os.execv(python_interpreter_path, [python_interpreter_path] + sys.argv) 1401 os.execv(python_interpreter_path, [python_interpreter_path] + options + sys.argv)
1359 else: 1402 else:
1360 sys.exit(subprocess.Popen([python_interpreter_path] + sys.argv).wait()) 1403 sys.exit(subprocess.Popen([python_interpreter_path] + options + sys.argv).wait())
1361 except (KeyboardInterrupt, SystemExit): 1404 except (KeyboardInterrupt, SystemExit):
1362 raise 1405 raise
1363 except: 1406 except:
1364 pass 1407 pass
1365 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"): 1408 for variable in ("GENTOO_PYTHON_PROCESS_NAME", "GENTOO_PYTHON_WRAPPER_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH", "GENTOO_PYTHON_TARGET_SCRIPT_PATH_VERIFICATION"):
… …
1407 fi 1450 fi
1408 1451
1409 _python_check_python_pkg_setup_execution 1452 _python_check_python_pkg_setup_execution
1410 _python_initialize_prefix_variables 1453 _python_initialize_prefix_variables
1411 1454
1412 local b file files=() intermediate_installation_images_directory PYTHON_ABI quiet="0" regex shebang version_executable wrapper_scripts=() wrapper_scripts_set=() 1455 local absolute_file b file files=() intermediate_installation_images_directory PYTHON_ABI quiet="0" regex shebang version_executable wrapper_scripts=() wrapper_scripts_set=()
1413 1456
1414 while (($#)); do 1457 while (($#)); do
1415 case "$1" in 1458 case "$1" in
1416 -q|--quiet) 1459 -q|--quiet)
1417 quiet="1" 1460 quiet="1"
… …
1499 break 1542 break
1500 fi 1543 fi
1501 done 1544 done
1502 fi 1545 fi
1503 1546
1504 [[ "${version_executable}" == "0" || ! -x "${file}" ]] && continue 1547 [[ "${version_executable}" == "0" ]] && continue
1505 1548
1549 if [[ -L "${file}" ]]; then
1550 absolute_file="$(readlink "${file}")"
1551 if [[ "${absolute_file}" == /* ]]; then
1552 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${absolute_file##/}"
1553 else
1554 if [[ "${file}" == */* ]]; then
1555 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${file%/*}/${absolute_file}"
1556 else
1557 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${absolute_file}"
1558 fi
1559 fi
1560 else
1561 absolute_file="${intermediate_installation_images_directory}/${PYTHON_ABI}${EPREFIX}/${file}"
1562 fi
1563
1564 [[ ! -x "${absolute_file}" ]] && continue
1565
1506 shebang="$(head -n1 "${file}")" || die "Extraction of shebang from '${file}' failed" 1566 shebang="$(head -n1 "${absolute_file}")" || die "Extraction of shebang from '${absolute_file}' failed"
1507 1567
1508 if [[ "${version_executable}" == "2" ]]; then 1568 if [[ "${version_executable}" == "2" ]]; then
1509 wrapper_scripts+=("${ED}${file}") 1569 wrapper_scripts+=("${ED}${file}")
1510 elif [[ "${version_executable}" == "1" ]]; then 1570 elif [[ "${version_executable}" == "1" ]]; then
1511 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}([[:digit:]]+(\.[[:digit:]]+)?)?($|[[:space:]]+) ]]; then 1571 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}([[:digit:]]+(\.[[:digit:]]+)?)?($|[[:space:]]+) ]]; then
… …
1522 fi 1582 fi
1523 1583
1524 mv "${file}" "${file}-${PYTHON_ABI}" || die "Renaming of '${file}' failed" 1584 mv "${file}" "${file}-${PYTHON_ABI}" || die "Renaming of '${file}' failed"
1525 1585
1526 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}[[:digit:]]*($|[[:space:]]+) ]]; then 1586 if [[ "${shebang}" =~ ${_PYTHON_SHEBANG_BASE_PART_REGEX}[[:digit:]]*($|[[:space:]]+) ]]; then
1587 if [[ -L "${file}-${PYTHON_ABI}" ]]; then
1588 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${absolute_file}"
1589 else
1527 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${file}-${PYTHON_ABI}" 1590 python_convert_shebangs $([[ "${quiet}" == "1" ]] && echo --quiet) "${PYTHON_ABI}" "${file}-${PYTHON_ABI}"
1591 fi
1528 fi 1592 fi
1529 done 1593 done
1530 1594
1531 popd > /dev/null || die "popd failed" 1595 popd > /dev/null || die "popd failed"
1532 1596
1533 if ROOT="/" has_version sys-apps/coreutils; then 1597 if ROOT="/" has_version sys-apps/coreutils; then
1534 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" 1598 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"
1535 else 1599 else
1536 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed" 1600 cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation image for Python ABI '${PYTHON_ABI} into installation image failed"
1537 fi 1601 fi
1538 done 1602 done
1539 1603
… …
1557 stdout = sys.stdout.buffer 1621 stdout = sys.stdout.buffer
1558else: 1622else:
1559 # Python 2 1623 # Python 2
1560 stdout = sys.stdout 1624 stdout = sys.stdout
1561 1625
1626python_wrapper_scripts_file = open('${T}/python_wrapper_scripts', 'rb')
1562files = set(open('${T}/python_wrapper_scripts', 'rb').read().rstrip(${b}'\x00').split(${b}'\x00')) 1627files = set(python_wrapper_scripts_file.read().rstrip(${b}'\x00').split(${b}'\x00'))
1628python_wrapper_scripts_file.close()
1563 1629
1564for file in sorted(files): 1630for file in sorted(files):
1565 stdout.write(file) 1631 stdout.write(file)
1566 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts") 1632 stdout.write(${b}'\x00')" || die "${FUNCNAME}(): Failure of extraction of set of wrapper scripts")
1567 1633
… …
1632 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable. 1698 # python-updater checks PYTHON_REQUESTED_ACTIVE_VERSION variable.
1633 PYTHON_REQUESTED_ACTIVE_VERSION="$1" 1699 PYTHON_REQUESTED_ACTIVE_VERSION="$1"
1634} 1700}
1635 1701
1636# @FUNCTION: python_need_rebuild 1702# @FUNCTION: python_need_rebuild
1703# @DESCRIPTION:
1637# @DESCRIPTION: Mark current package for rebuilding by python-updater after 1704# Mark current package for rebuilding by python-updater after
1638# switching of active version of Python. 1705# switching of active version of Python.
1639python_need_rebuild() { 1706python_need_rebuild() {
1640 if _python_package_supporting_installation_for_multiple_python_abis; then 1707 if _python_package_supporting_installation_for_multiple_python_abis; then
1641 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs" 1708 die "${FUNCNAME}() cannot be used in ebuilds of packages supporting installation for multiple Python ABIs"
1642 fi 1709 fi
… …
1652 1719
1653# ================================================================================================ 1720# ================================================================================================
1654# ======================================= GETTER FUNCTIONS ======================================= 1721# ======================================= GETTER FUNCTIONS =======================================
1655# ================================================================================================ 1722# ================================================================================================
1656 1723
1657_PYTHON_ABI_EXTRACTION_COMMAND='import platform 1724_PYTHON_ABI_EXTRACTION_COMMAND=\
1725'import platform
1658import sys 1726import sys
1659sys.stdout.write(".".join(str(x) for x in sys.version_info[:2])) 1727sys.stdout.write(".".join(str(x) for x in sys.version_info[:2]))
1660if platform.system()[:4] == "Java": 1728if platform.system()[:4] == "Java":
1661 sys.stdout.write("-jython")' 1729 sys.stdout.write("-jython")
1730elif hasattr(platform, "python_implementation") and platform.python_implementation() == "PyPy":
1731 sys.stdout.write("-pypy-" + ".".join(str(x) for x in sys.pypy_version_info[:2]))'
1662 1732
1663_python_get_implementation() { 1733_python_get_implementation() {
1664 local ignore_invalid="0" 1734 local ignore_invalid="0"
1665 1735
1666 while (($#)); do 1736 while (($#)); do
… …
1688 1758
1689 if [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then 1759 if [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+$ ]]; then
1690 echo "CPython" 1760 echo "CPython"
1691 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then 1761 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-jython$ ]]; then
1692 echo "Jython" 1762 echo "Jython"
1763 elif [[ "$1" =~ ^[[:digit:]]+\.[[:digit:]]+-pypy-[[:digit:]]+\.[[:digit:]]+$ ]]; then
1764 echo "PyPy"
1693 else 1765 else
1694 if [[ "${ignore_invalid}" == "0" ]]; then 1766 if [[ "${ignore_invalid}" == "0" ]]; then
1695 die "${FUNCNAME}(): Unrecognized Python ABI '$1'" 1767 die "${FUNCNAME}(): Unrecognized Python ABI '$1'"
1696 fi 1768 fi
1697 fi 1769 fi
… …
1806 else 1878 else
1807 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 1879 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1808 python_interpreter="python${PYTHON_ABI}" 1880 python_interpreter="python${PYTHON_ABI}"
1809 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 1881 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1810 python_interpreter="jython${PYTHON_ABI%-jython}" 1882 python_interpreter="jython${PYTHON_ABI%-jython}"
1883 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
1884 python_interpreter="pypy-c${PYTHON_ABI#*-pypy-}"
1811 fi 1885 fi
1812 1886
1813 if [[ "${absolute_path_output}" == "1" ]]; then 1887 if [[ "${absolute_path_output}" == "1" ]]; then
1814 echo -n "${EPREFIX}/usr/bin/${python_interpreter}" 1888 echo -n "${EPREFIX}/usr/bin/${python_interpreter}"
1815 else 1889 else
… …
1908 if [[ "${EAPI:-0}" == "0" ]]; then 1982 if [[ "${EAPI:-0}" == "0" ]]; then
1909 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 1983 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1910 echo "=dev-lang/python-${PYTHON_ABI}*" 1984 echo "=dev-lang/python-${PYTHON_ABI}*"
1911 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 1985 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1912 echo "=dev-java/jython-${PYTHON_ABI%-jython}*" 1986 echo "=dev-java/jython-${PYTHON_ABI%-jython}*"
1987 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
1988 echo "=dev-python/pypy-${PYTHON_ABI#*-pypy-}*"
1913 fi 1989 fi
1914 else 1990 else
1915 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 1991 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1916 echo "dev-lang/python:${PYTHON_ABI}" 1992 echo "dev-lang/python:${PYTHON_ABI}"
1917 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 1993 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1918 echo "dev-java/jython:${PYTHON_ABI%-jython}" 1994 echo "dev-java/jython:${PYTHON_ABI%-jython}"
1995 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
1996 echo "dev-python/pypy:${PYTHON_ABI#*-pypy-}"
1919 fi 1997 fi
1920 fi 1998 fi
1921} 1999}
1922 2000
1923# @FUNCTION: python_get_includedir 2001# @FUNCTION: python_get_includedir
… …
1970 2048
1971 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2049 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
1972 echo "${prefix}usr/include/python${PYTHON_ABI}" 2050 echo "${prefix}usr/include/python${PYTHON_ABI}"
1973 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2051 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
1974 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Include" 2052 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Include"
2053 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2054 echo "${prefix}usr/$(get_libdir)/pypy${PYTHON_ABI#*-pypy-}/include"
1975 fi 2055 fi
1976} 2056}
1977 2057
1978# @FUNCTION: python_get_libdir 2058# @FUNCTION: python_get_libdir
1979# @USAGE: [-b|--base-path] [-f|--final-ABI] 2059# @USAGE: [-b|--base-path] [-f|--final-ABI]
1980# @DESCRIPTION: 2060# @DESCRIPTION:
1981# Print path to Python library directory. 2061# Print path to Python standard library directory.
1982# If --base-path option is specified, then path not prefixed with "/" is printed. 2062# If --base-path option is specified, then path not prefixed with "/" is printed.
1983# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used. 2063# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
1984python_get_libdir() { 2064python_get_libdir() {
1985 _python_check_python_pkg_setup_execution 2065 _python_check_python_pkg_setup_execution
1986 2066
… …
2025 2105
2026 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2106 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2027 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}" 2107 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}"
2028 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2108 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2029 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib" 2109 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib"
2110 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2111 die "${FUNCNAME}(): PyPy has multiple standard library directories"
2030 fi 2112 fi
2031} 2113}
2032 2114
2033# @FUNCTION: python_get_sitedir 2115# @FUNCTION: python_get_sitedir
2034# @USAGE: [-b|--base-path] [-f|--final-ABI] 2116# @USAGE: [-b|--base-path] [-f|--final-ABI]
… …
2037# If --base-path option is specified, then path not prefixed with "/" is printed. 2119# If --base-path option is specified, then path not prefixed with "/" is printed.
2038# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used. 2120# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
2039python_get_sitedir() { 2121python_get_sitedir() {
2040 _python_check_python_pkg_setup_execution 2122 _python_check_python_pkg_setup_execution
2041 2123
2042 local final_ABI="0" options=() 2124 local base_path="0" final_ABI="0" prefix PYTHON_ABI="${PYTHON_ABI}"
2043 2125
2044 while (($#)); do 2126 while (($#)); do
2045 case "$1" in 2127 case "$1" in
2046 -b|--base-path) 2128 -b|--base-path)
2047 options+=("$1") 2129 base_path="1"
2048 ;; 2130 ;;
2049 -f|--final-ABI) 2131 -f|--final-ABI)
2050 final_ABI="1" 2132 final_ABI="1"
2051 options+=("$1")
2052 ;; 2133 ;;
2053 -*) 2134 -*)
2054 die "${FUNCNAME}(): Unrecognized option '$1'" 2135 die "${FUNCNAME}(): Unrecognized option '$1'"
2055 ;; 2136 ;;
2056 *) 2137 *)
… …
2058 ;; 2139 ;;
2059 esac 2140 esac
2060 shift 2141 shift
2061 done 2142 done
2062 2143
2144 if [[ "${base_path}" == "0" ]]; then
2145 prefix="/"
2146 fi
2147
2063 if [[ "${final_ABI}" == "1" ]]; then 2148 if [[ "${final_ABI}" == "1" ]]; then
2064 if ! _python_package_supporting_installation_for_multiple_python_abis; then 2149 if ! _python_package_supporting_installation_for_multiple_python_abis; then
2065 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs" 2150 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
2066 fi 2151 fi
2152 PYTHON_ABI="$(PYTHON -f --ABI)"
2067 else 2153 else
2068 if _python_package_supporting_installation_for_multiple_python_abis && ! _python_abi-specific_local_scope; then 2154 if _python_package_supporting_installation_for_multiple_python_abis; then
2155 if ! _python_abi-specific_local_scope; then
2069 die "${FUNCNAME}() should be used in ABI-specific local scope" 2156 die "${FUNCNAME}() should be used in ABI-specific local scope"
2070 fi 2157 fi
2158 else
2159 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
2071 fi 2160 fi
2161 fi
2072 2162
2073 echo "$(python_get_libdir "${options[@]}")/site-packages" 2163 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2164 echo "${prefix}usr/$(get_libdir)/python${PYTHON_ABI}/site-packages"
2165 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2166 echo "${prefix}usr/share/jython-${PYTHON_ABI%-jython}/Lib/site-packages"
2167 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2168 echo "${prefix}usr/$(get_libdir)/pypy${PYTHON_ABI#*-pypy-}/site-packages"
2169 fi
2074} 2170}
2075 2171
2076# @FUNCTION: python_get_library 2172# @FUNCTION: python_get_library
2077# @USAGE: [-b|--base-path] [-f|--final-ABI] [-l|--linker-option] 2173# @USAGE: [-b|--base-path] [-f|--final-ABI] [-l|--linker-option]
2078# @DESCRIPTION: 2174# @DESCRIPTION:
… …
2135 else 2231 else
2136 echo "${prefix}usr/$(get_libdir)/libpython${PYTHON_ABI}$(get_libname)" 2232 echo "${prefix}usr/$(get_libdir)/libpython${PYTHON_ABI}$(get_libname)"
2137 fi 2233 fi
2138 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2234 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2139 die "${FUNCNAME}(): Jython does not have shared library" 2235 die "${FUNCNAME}(): Jython does not have shared library"
2236 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2237 die "${FUNCNAME}(): PyPy does not have shared library"
2140 fi 2238 fi
2141} 2239}
2142 2240
2143# @FUNCTION: python_get_version 2241# @FUNCTION: python_get_version
2144# @USAGE: [-f|--final-ABI] [-l|--language] [--full] [--major] [--minor] [--micro] 2242# @USAGE: [-f|--final-ABI] [-l|--language] [--full] [--major] [--minor] [--micro]
2145# @DESCRIPTION: 2243# @DESCRIPTION:
2146# Print Python version. 2244# Print version of Python implementation.
2147# --full, --major, --minor and --micro options cannot be specified simultaneously. 2245# --full, --major, --minor and --micro options cannot be specified simultaneously.
2148# If --full, --major, --minor and --micro options are not specified, then "${major_version}.${minor_version}" is printed. 2246# If --full, --major, --minor and --micro options are not specified, then "${major_version}.${minor_version}" is printed.
2149# If --language option is specified, then Python language version is printed. 2247# If --language option is specified, then version of Python language is printed.
2150# --language and --full options cannot be specified simultaneously. 2248# --language and --full options cannot be specified simultaneously.
2151# --language and --micro options cannot be specified simultaneously. 2249# --language and --micro options cannot be specified simultaneously.
2152# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used. 2250# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
2153python_get_version() { 2251python_get_version() {
2154 _python_check_python_pkg_setup_execution 2252 _python_check_python_pkg_setup_execution
… …
2217 else 2315 else
2218 echo "${language_version}" 2316 echo "${language_version}"
2219 fi 2317 fi
2220 else 2318 else
2221 if [[ "${full}" == "1" ]]; then 2319 if [[ "${full}" == "1" ]]; then
2222 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:3]))" 2320 python_command="import sys; print('.'.join(str(x) for x in getattr(sys, 'pypy_version_info', sys.version_info)[:3]))"
2223 elif [[ "${major}" == "1" ]]; then 2321 elif [[ "${major}" == "1" ]]; then
2224 python_command="from sys import version_info; print(version_info[0])" 2322 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[0])"
2225 elif [[ "${minor}" == "1" ]]; then 2323 elif [[ "${minor}" == "1" ]]; then
2226 python_command="from sys import version_info; print(version_info[1])" 2324 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[1])"
2227 elif [[ "${micro}" == "1" ]]; then 2325 elif [[ "${micro}" == "1" ]]; then
2228 python_command="from sys import version_info; print(version_info[2])" 2326 python_command="import sys; print(getattr(sys, 'pypy_version_info', sys.version_info)[2])"
2229 else 2327 else
2230 if [[ -n "${PYTHON_ABI}" && "${final_ABI}" == "0" ]]; then 2328 if [[ -n "${PYTHON_ABI}" && "${final_ABI}" == "0" ]]; then
2231 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then 2329 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then
2232 echo "${PYTHON_ABI}" 2330 echo "${PYTHON_ABI}"
2233 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then 2331 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then
2234 echo "${PYTHON_ABI%-jython}" 2332 echo "${PYTHON_ABI%-jython}"
2333 elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then
2334 echo "${PYTHON_ABI#*-pypy-}"
2235 fi 2335 fi
2236 return 2336 return
2237 fi 2337 fi
2238 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:2]))" 2338 python_command="from sys import version_info; print('.'.join(str(x) for x in version_info[:2]))"
2239 fi 2339 fi
… …
2244 "$(PYTHON ${PYTHON_ABI})" -c "${python_command}" 2344 "$(PYTHON ${PYTHON_ABI})" -c "${python_command}"
2245 fi 2345 fi
2246 fi 2346 fi
2247} 2347}
2248 2348
2349# @FUNCTION: python_get_implementation_and_version
2350# @USAGE: [-f|--final-ABI]
2351# @DESCRIPTION:
2352# Print name and version of Python implementation.
2353# If version of Python implementation is not bound to version of Python language, then
2354# version of Python language is additionally printed.
2355# If --final-ABI option is specified, then final ABI from the list of enabled ABIs is used.
2356python_get_implementation_and_version() {
2357 _python_check_python_pkg_setup_execution
2358
2359 local final_ABI="0" PYTHON_ABI="${PYTHON_ABI}"
2360
2361 while (($#)); do
2362 case "$1" in
2363 -f|--final-ABI)
2364 final_ABI="1"
2365 ;;
2366 -*)
2367 die "${FUNCNAME}(): Unrecognized option '$1'"
2368 ;;
2369 *)
2370 die "${FUNCNAME}(): Invalid usage"
2371 ;;
2372 esac
2373 shift
2374 done
2375
2376 if [[ "${final_ABI}" == "1" ]]; then
2377 if ! _python_package_supporting_installation_for_multiple_python_abis; then
2378 die "${FUNCNAME}(): '--final-ABI' option cannot be used in ebuilds of packages not supporting installation for multiple Python ABIs"
2379 fi
2380 PYTHON_ABI="$(PYTHON -f --ABI)"
2381 else
2382 if _python_package_supporting_installation_for_multiple_python_abis; then
2383 if ! _python_abi-specific_local_scope; then
2384 die "${FUNCNAME}() should be used in ABI-specific local scope"
2385 fi
2386 else
2387 PYTHON_ABI="${PYTHON_ABI:-$(PYTHON --ABI)}"
2388 fi
2389 fi
2390
2391 if [[ "${PYTHON_ABI}" =~ ^[[:digit:]]+\.[[:digit:]]+-[[:alnum:]]+-[[:digit:]]+\.[[:digit:]]+$ ]]; then
2392 echo "$(_python_get_implementation "${PYTHON_ABI}") ${PYTHON_ABI##*-} (Python ${PYTHON_ABI%%-*})"
2393 else
2394 echo "$(_python_get_implementation "${PYTHON_ABI}") ${PYTHON_ABI%%-*}"
2395 fi
2396}
2397
2249# ================================================================================================ 2398# ================================================================================================
2250# ================================ FUNCTIONS FOR RUNNING OF TESTS ================================ 2399# ================================ FUNCTIONS FOR RUNNING OF TESTS ================================
2251# ================================================================================================ 2400# ================================================================================================
2252 2401
2253# @ECLASS-VARIABLE: PYTHON_TEST_VERBOSITY 2402# @ECLASS-VARIABLE: PYTHON_TEST_VERBOSITY
… …
2259_python_test_hook() { 2408_python_test_hook() {
2260 if [[ "$#" -ne 1 ]]; then 2409 if [[ "$#" -ne 1 ]]; then
2261 die "${FUNCNAME}() requires 1 argument" 2410 die "${FUNCNAME}() requires 1 argument"
2262 fi 2411 fi
2263 2412
2264 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${FUNCNAME[3]}_$1_hook")" == "function" ]]; then 2413 if _python_package_supporting_installation_for_multiple_python_abis && [[ "$(type -t "${_PYTHON_TEST_FUNCTION}_$1_hook")" == "function" ]]; then
2265 "${FUNCNAME[3]}_$1_hook" 2414 "${_PYTHON_TEST_FUNCTION}_$1_hook"
2266 fi 2415 fi
2267} 2416}
2268 2417
2269# @FUNCTION: python_execute_nosetests 2418# @FUNCTION: python_execute_nosetests
2270# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments] 2419# @USAGE: [-P|--PYTHONPATH PYTHONPATH] [-s|--separate-build-dirs] [--] [arguments]
… …
2304 python_test_function() { 2453 python_test_function() {
2305 local evaluated_PYTHONPATH 2454 local evaluated_PYTHONPATH
2306 2455
2307 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2456 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2308 2457
2309 _python_test_hook pre 2458 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook pre
2310 2459
2311 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2460 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2312 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2461 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2313 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2462 PYTHONPATH="${evaluated_PYTHONPATH}" nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2314 else 2463 else
2315 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL} 2464 echo ${_BOLD}nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@"${_NORMAL}
2316 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?" 2465 nosetests --verbosity="${PYTHON_TEST_VERBOSITY}" "$@" || return "$?"
2317 fi 2466 fi
2318 2467
2319 _python_test_hook post 2468 _PYTHON_TEST_FUNCTION="python_execute_nosetests" _python_test_hook post
2320 } 2469 }
2321 if _python_package_supporting_installation_for_multiple_python_abis; then 2470 if _python_package_supporting_installation_for_multiple_python_abis; then
2322 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2471 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2323 else 2472 else
2324 if [[ -n "${separate_build_dirs}" ]]; then 2473 if [[ -n "${separate_build_dirs}" ]]; then
… …
2368 python_test_function() { 2517 python_test_function() {
2369 local evaluated_PYTHONPATH 2518 local evaluated_PYTHONPATH
2370 2519
2371 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2520 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2372 2521
2373 _python_test_hook pre 2522 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook pre
2374 2523
2375 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2524 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2376 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL} 2525 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@"${_NORMAL}
2377 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?" 2526 PYTHONPATH="${evaluated_PYTHONPATH}" py.test $([[ "${PYTHON_TEST_VERBOSITY}" -ge 2 ]] && echo -v) "$@" || return "$?"
2378 else 2527 else
2379 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL} 2528 echo ${_BOLD}py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@"${_NORMAL}
2380 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?" 2529 py.test $([[ "${PYTHON_TEST_VERBOSITY}" -gt 1 ]] && echo -v) "$@" || return "$?"
2381 fi 2530 fi
2382 2531
2383 _python_test_hook post 2532 _PYTHON_TEST_FUNCTION="python_execute_py.test" _python_test_hook post
2384 } 2533 }
2385 if _python_package_supporting_installation_for_multiple_python_abis; then 2534 if _python_package_supporting_installation_for_multiple_python_abis; then
2386 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2535 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2387 else 2536 else
2388 if [[ -n "${separate_build_dirs}" ]]; then 2537 if [[ -n "${separate_build_dirs}" ]]; then
… …
2432 python_test_function() { 2581 python_test_function() {
2433 local evaluated_PYTHONPATH 2582 local evaluated_PYTHONPATH
2434 2583
2435 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\"" 2584 eval "evaluated_PYTHONPATH=\"${PYTHONPATH_template}\""
2436 2585
2437 _python_test_hook pre 2586 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook pre
2438 2587
2439 if [[ -n "${evaluated_PYTHONPATH}" ]]; then 2588 if [[ -n "${evaluated_PYTHONPATH}" ]]; then
2440 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2589 echo ${_BOLD}PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2441 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2590 PYTHONPATH="${evaluated_PYTHONPATH}" trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2442 else 2591 else
2443 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL} 2592 echo ${_BOLD}trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@"${_NORMAL}
2444 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?" 2593 trial $([[ "${PYTHON_TEST_VERBOSITY}" -ge 4 ]] && echo --spew) "$@" || return "$?"
2445 fi 2594 fi
2446 2595
2447 _python_test_hook post 2596 _PYTHON_TEST_FUNCTION="python_execute_trial" _python_test_hook post
2448 } 2597 }
2449 if _python_package_supporting_installation_for_multiple_python_abis; then 2598 if _python_package_supporting_installation_for_multiple_python_abis; then
2450 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@" 2599 python_execute_function ${separate_build_dirs:+-s} python_test_function "$@"
2451 else 2600 else
2452 if [[ -n "${separate_build_dirs}" ]]; then 2601 if [[ -n "${separate_build_dirs}" ]]; then
… …
2702 2851
2703 for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do 2852 for PYTHON_ABI in ${iterated_PYTHON_ABIS}; do
2704 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})) || ((${#evaluated_dirs[@]})) || ((${#evaluated_files[@]})); then 2853 if ((${#site_packages_dirs[@]})) || ((${#site_packages_files[@]})) || ((${#evaluated_dirs[@]})) || ((${#evaluated_files[@]})); then
2705 return_code="0" 2854 return_code="0"
2706 stderr="" 2855 stderr=""
2707 ebegin "Compilation and optimization of Python modules for $(python_get_implementation) $(python_get_version)" 2856 ebegin "Compilation and optimization of Python modules for $(python_get_implementation_and_version)"
2708 if ((${#site_packages_dirs[@]})) || ((${#evaluated_dirs[@]})); then 2857 if ((${#site_packages_dirs[@]})) || ((${#evaluated_dirs[@]})); then
2709 for dir in "${site_packages_dirs[@]}"; do 2858 for dir in "${site_packages_dirs[@]}"; do
2710 dirs+=("${root}$(python_get_sitedir)/${dir}") 2859 dirs+=("${root}$(python_get_sitedir)/${dir}")
2711 done 2860 done
2712 for dir in "${evaluated_dirs[@]}"; do 2861 for dir in "${evaluated_dirs[@]}"; do
2713 eval "dirs+=(\"\${root}${dir}\")" 2862 eval "dirs+=(\"\${root}${dir}\")"
2714 done 2863 done
2715 stderr+="${stderr:+$'\n'}$("$(PYTHON)" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1" 2864 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m compileall "${options[@]}" "${dirs[@]}" 2>&1)" || return_code="1"
2716 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2865 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2717 "$(PYTHON)" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1" 2866 "$(PYTHON)" -O -m compileall "${options[@]}" "${dirs[@]}" &> /dev/null || return_code="1"
2718 fi 2867 fi
2719 _python_clean_compiled_modules "${dirs[@]}" 2868 _python_clean_compiled_modules "${dirs[@]}"
2720 fi 2869 fi
2721 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then 2870 if ((${#site_packages_files[@]})) || ((${#evaluated_files[@]})); then
2722 for file in "${site_packages_files[@]}"; do 2871 for file in "${site_packages_files[@]}"; do
2723 files+=("${root}$(python_get_sitedir)/${file}") 2872 files+=("${root}$(python_get_sitedir)/${file}")
2724 done 2873 done
2725 for file in "${evaluated_files[@]}"; do 2874 for file in "${evaluated_files[@]}"; do
2726 eval "files+=(\"\${root}${file}\")" 2875 eval "files+=(\"\${root}${file}\")"
2727 done 2876 done
2728 stderr+="${stderr:+$'\n'}$("$(PYTHON)" "${root}$(python_get_libdir)/py_compile.py" "${files[@]}" 2>&1)" || return_code="1" 2877 stderr+="${stderr:+$'\n'}$("$(PYTHON)" -m py_compile "${files[@]}" 2>&1)" || return_code="1"
2729 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2878 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2730 "$(PYTHON)" -O "${root}$(python_get_libdir)/py_compile.py" "${files[@]}" &> /dev/null || return_code="1" 2879 "$(PYTHON)" -O -m py_compile "${files[@]}" &> /dev/null || return_code="1"
2731 fi 2880 fi
2732 _python_clean_compiled_modules "${files[@]}" 2881 _python_clean_compiled_modules "${files[@]}"
2733 fi 2882 fi
2734 eend "${return_code}" 2883 eend "${return_code}"
2735 if [[ -n "${stderr}" ]]; then 2884 if [[ -n "${stderr}" ]]; then
2736 eerror "Syntax errors / warnings in Python modules for $(python_get_implementation) $(python_get_version):" &> /dev/null 2885 eerror "Syntax errors / warnings in Python modules for $(python_get_implementation_and_version):" &> /dev/null
2737 while read stderr_line; do 2886 while read stderr_line; do
2738 eerror " ${stderr_line}" 2887 eerror " ${stderr_line}"
2739 done <<< "${stderr}" 2888 done <<< "${stderr}"
2740 fi 2889 fi
2741 fi 2890 fi
… …
2752 fi 2901 fi
2753 2902
2754 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then 2903 if ((${#other_dirs[@]})) || ((${#other_files[@]})); then
2755 return_code="0" 2904 return_code="0"
2756 stderr="" 2905 stderr=""
2757 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation) $(python_get_version)" 2906 ebegin "Compilation and optimization of Python modules placed outside of site-packages directories for $(python_get_implementation_and_version)"
2758 if ((${#other_dirs[@]})); then 2907 if ((${#other_dirs[@]})); then
2759 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1" 2908 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m compileall "${options[@]}" "${other_dirs[@]}" 2>&1)" || return_code="1"
2760 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2909 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2761 "$(PYTHON ${PYTHON_ABI})" -O "${root}$(python_get_libdir)/compileall.py" "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1" 2910 "$(PYTHON ${PYTHON_ABI})" -O -m compileall "${options[@]}" "${other_dirs[@]}" &> /dev/null || return_code="1"
2762 fi 2911 fi
2763 _python_clean_compiled_modules "${other_dirs[@]}" 2912 _python_clean_compiled_modules "${other_dirs[@]}"
2764 fi 2913 fi
2765 if ((${#other_files[@]})); then 2914 if ((${#other_files[@]})); then
2766 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" 2>&1)" || return_code="1" 2915 stderr+="${stderr:+$'\n'}$("$(PYTHON ${PYTHON_ABI})" -m py_compile "${other_files[@]}" 2>&1)" || return_code="1"
2767 if [[ "$(_python_get_implementation "${PYTHON_ABI}")" != "Jython" ]]; then 2916 if ! has "$(_python_get_implementation "${PYTHON_ABI}")" Jython PyPy; then
2768 "$(PYTHON ${PYTHON_ABI})" -O "${root}$(python_get_libdir)/py_compile.py" "${other_files[@]}" &> /dev/null || return_code="1" 2917 "$(PYTHON ${PYTHON_ABI})" -O -m py_compile "${other_files[@]}" &> /dev/null || return_code="1"
2769 fi 2918 fi
2770 _python_clean_compiled_modules "${other_files[@]}" 2919 _python_clean_compiled_modules "${other_files[@]}"
2771 fi 2920 fi
2772 eend "${return_code}" 2921 eend "${return_code}"
2773 if [[ -n "${stderr}" ]]; then 2922 if [[ -n "${stderr}" ]]; then
2774 eerror "Syntax errors / warnings in Python modules placed outside of site-packages directories for $(python_get_implementation) $(python_get_version):" &> /dev/null 2923 eerror "Syntax errors / warnings in Python modules placed outside of site-packages directories for $(python_get_implementation_and_version):" &> /dev/null
2775 while read stderr_line; do 2924 while read stderr_line; do
2776 eerror " ${stderr_line}" 2925 eerror " ${stderr_line}"
2777 done <<< "${stderr}" 2926 done <<< "${stderr}"
2778 fi 2927 fi
2779 fi 2928 fi
Legend:
Removed from v.1.122  
changed lines
  Added in v.1.139
  ViewVC Help
Powered by ViewVC 1.1.13