Python2/3 compat + docstring move