reverting assertRaises that fail on travis but not on my machine :-(. adding back python 2.6