This adds the *timeout* and *input* arguments for Py2.

This required a small doctest renormalizer to handle the byte string
difference.