this text should probably read "a callable raising %s" % " or ".join(self.expected)

You'll have to tuple-ize *expected* on the way in, though, to make that work properly.