Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 21 Nov 2012 13:13:02 +0000 (14:13 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 21 Nov 2012 13:13:02 +0000 (14:13 +0100)
* maint:
  tests: fix a spurious failure when $PYTHON is in the environment
  python tests: support PEP-3147 installation layout
  python: uninstall cater to PEP-3147
  tests: improve a comment
  tests: honour $PYTHON override
  tests: typofix in message
  news: document fix for bug#8847 (PEP-3147, __pycache__)
  python: improve support for modern python (CPython 3.2 and PyPy)

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
17 files changed:
1  2 
NEWS
lib/am/python.am
t/ax/am-test-lib.sh
t/list-of-tests.mk
t/nobase-python.sh
t/py-compile-basedir.sh
t/py-compile-basic.sh
t/py-compile-destdir.sh
t/py-compile-option-terminate.sh
t/python-pr10995.sh
t/python-too-old.sh
t/python-vars.sh
t/python-virtualenv.sh
t/python10.sh
t/python11.sh
t/python12.sh
t/python3.sh

diff --cc NEWS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/python10.sh
Simple merge
diff --cc t/python11.sh
  # Test missing python.
  
  # Python is not required for this test.
 -. ./defs || exit 1
 +. test-init.sh
  
+ # We don't want to allow user overrides in this test.
+ PYTHON=; unset PYTHON
  cat >>configure.ac <<'EOF'
  m4_define([_AM_PYTHON_INTERPRETER_LIST], [IShouldNotExist1 IShouldNotExist2])
  AM_PATH_PYTHON
diff --cc t/python12.sh
Simple merge
diff --cc t/python3.sh
Simple merge