Issue #25488: merge idle.py from 3.5.