Making all the doctests work with py3