Fix WSGIProxy2 so that all our tests pass on Python3