Get doctests passing under both Python3 and Py3k.
Note support for Python 3.2 / 3.3.