pull in some upstream py3 compat for numpydoc