more macro hygiene cleanup: test #[pymethods] and more arg parsing and protos#1843

davidhewitt merged 2 commits intomainPyO3/pyo3:mainfrom

pymethods_hygienePyO3/pyo3:pymethods_hygieneCopy head branch name to clipboard