Don't use BaseException.message

This patch fixes the deprecation warning when testing under py26, and
gets us one step closer to Python 3 compatibility.

Change-Id: Ia6ac113a917eca075ef5abee937634bd4e488fa5
Merge "Don't use BaseException.message"