merge w/ 3.3

cc39b1ed · Brett Cannon · 4f4088eb · 27bbfdbc · cc39b1ed · cc39b1ed
Commit cc39b1ed authored Jun 15, 2013 by Brett Cannon
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Lib/idlelib/PathBrowser.py Lib/idlelib/PathBrowser.py +0 -1

Lib/idlelib/TreeWidget.py Lib/idlelib/TreeWidget.py +0 -1

Misc/NEWS Misc/NEWS +2 -0

No files found.
--- a/Lib/idlelib/PathBrowser.py
+++ b/Lib/idlelib/PathBrowser.py
 import os
 import sys
-import imp
 import importlib.machinery

 from idlelib.TreeWidget import TreeItem

--- a/Lib/idlelib/TreeWidget.py
+++ b/Lib/idlelib/TreeWidget.py
@@ -16,7 +16,6 @@

 import os
 from tkinter import *
-import imp

 from idlelib import ZoomHeight
 from idlelib.configHandler import idleConf

--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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.