Support for Python 2.6 - which lacks addCleanup