assert_ deprecated; use assertTrue instead
Merge branch 'merge.py3k' of github.com:LexMachinaInc/supervisor into merge.py3k