* gdb.python/py-prettyprint.py (_iterator): Remove exception_flag

exception.
	(_iterator_except): New function.
	(ArrayPrinter): Use _iterator function instead of local _iterator
	class for Python 3 compatibility.
	(NoStringContainerPrinter): Use _iterator_except instead of
	_iterator.
	* gdb.python/py-typeprint.exp: Use exec(open(...).read()) instead of
	execfile for Python 3 compatibility.
	* gdb.python/python.exp: Handle Python 2.4 exception traceback
	format in error_prompt test.
This commit is contained in:
Paul Koning 2012-12-11 20:54:52 +00:00
parent 8d2cc612e5
commit 2960a434c3
4 changed files with 27 additions and 21 deletions

View file

@ -362,7 +362,7 @@ gdb_py_test_multiple "prompt substitution readline" \
"end" ""
gdb_test_multiple "python gdb.prompt_hook = error_prompt" "set the hook" {
-re "Python Exception <(type 'exceptions.|class ')RuntimeError'> Python exception called.*" {
-re "Python Exception (exceptions.RuntimeError|<(type 'exceptions.|class ')RuntimeError'>) Python exception called.*" {
pass "set hook"
}
}