Merge pull request #2085 from apache/jbilleter/python-3.9

Merge pull request #2085 from apache/jbilleter/python-3.9 #350