merge w/ 3.3

This commit is contained in:
Brett Cannon 2013-06-15 13:37:38 -04:00
commit cc39b1ed1d
3 changed files with 2 additions and 2 deletions

View file

@ -1,6 +1,5 @@
import os
import sys
import imp
import importlib.machinery
from idlelib.TreeWidget import TreeItem

View file

@ -16,7 +16,6 @@
import os
from tkinter import *
import imp
from idlelib import ZoomHeight
from idlelib.configHandler import idleConf

View file

@ -479,6 +479,8 @@ C-API
IDLE
----
- Remove dead imports of imp.
- Issue #18196: Avoid displaying spurious SystemExit tracebacks.
- Issue #5492: Avoid traceback when exiting IDLE caused by a race condition.