Sync python.el with upstream

Upstream commit: cad81e3d20a8d1f766ddfb76436a19205f8acd68