Merge pull request #21598 from github/tausbn/python-port-should-use-with

Merge pull request #21598 from github/tausbn/python-port-should-use-with #4698