Merge heads.

This commit is contained in:
Roger Serwy 2013-03-31 16:11:51 -05:00
commit e268196fb0
2 changed files with 6 additions and 2 deletions

View File

@ -170,8 +170,9 @@ class _ComplexBinder:
break
ishandlerrunning[:] = []
# Call all functions in doafterhandler and remove them from list
while doafterhandler:
doafterhandler.pop()()
for f in doafterhandler:
f()
doafterhandler[:] = []
if r:
return r
return handler

View File

@ -297,6 +297,9 @@ Core and Builtins
Library
-------
- Issue #8900: Using keyboard shortcuts in IDLE to open a file no longer
raises an exception.
- Issue #6649: Fixed missing exit status in IDLE. Patch by Guilherme Polo.
- Issue #17435: threading.Timer's __init__ method no longer uses mutable