Merge pull request
#12169 from meeseeksmachine/auto-backport-of-pr-12167-on-7.x...
Merge pull request
#12169 from meeseeksmachine/auto-backport-of-pr-12167-on-7.x
Backport PR
#12167 on branch 7.x (Set .py tempfile suffix when using vi/emacs editor shortcuts.)