Merge remote-tracking branch 'stefanha/tracing' into staging

* stefanha/tracing:
  configure: check for supported Python 2.x versions
  tracetool: avoid pkgutil.iter_modules() Python 2.7 function
  tracetool: avoid str.rpartition() Python 2.5 function
  tracetool: use Python 2.4-compatible __import__() arguments
  tracetool: use Python 2.4-compatible exception handling syntax
This commit is contained in:
Anthony Liguori 2012-05-01 18:46:52 -05:00
commit 15a0f3bf77
5 changed files with 29 additions and 17 deletions

7
configure vendored
View file

@ -1239,9 +1239,10 @@ fi
# Note that if the Python conditional here evaluates True we will exit
# with status 1 which is a shell 'false' value.
if ! "$python" -c 'import sys; sys.exit(sys.version_info[0] >= 3)'; then
echo "Python 2 required but '$python' is version 3 or better."
echo "Use --python=/path/to/python to specify a Python 2."
if ! "$python" -c 'import sys; sys.exit(sys.version_info < (2,4) or sys.version_info >= (3,))'; then
echo "Cannot use '$python', Python 2.4 or later is required."
echo "Note that Python 3 or later is not yet supported."
echo "Use --python=/path/to/python to specify a supported Python."
exit 1
fi