Run 2to3
Remove references to deprecated contextlib method