This version moves a Python bindings change that had slipped into the Go patch into the Python patch and words the future-proofing warning on notmuch_database_get_directory more strongly. There are no code changes from v1.