Changeset 45080947e292 didn't work for me with python2 6. because unicode
objects are not allowed as exception texts see:
My solution is attached.
The test provided passes. With 2.4-2.7. The solution provided looses information and there is nothing in python that prevents the use of unicode messages.
This change would mean lost fidelity for properly caught Invalid exceptions so I am not inclined to apply the "fix" part of the patch. I have however added the OneOf tests to the test suite.