[#8375] git py3 fixes
4 files changed