[Python-checkins] cpython (merge 3.3 -> default): merge w/ 3.3

[brett.cannon]

http://hg.python.org/cpython/rev/48b79f11571e
changeset:   84145:48b79f11571e
parent:      84142:0b96a16656b7
parent:      84144:61a1aa69e83e
user:        Brett Cannon <brett at python.org>
date:        Sat Jun 15 13:37:38 2013 -0400
summary:
  merge w/ 3.3

files:
  Lib/idlelib/PathBrowser.py |  1 -
  Lib/idlelib/TreeWidget.py  |  1 -
  Misc/NEWS                  |  2 ++
  3 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/idlelib/PathBrowser.py b/Lib/idlelib/PathBrowser.py
--- a/Lib/idlelib/PathBrowser.py
+++ b/Lib/idlelib/PathBrowser.py
@@ -1,6 +1,5 @@
 import os
 import sys
-import imp
 import importlib.machinery
 
 from idlelib.TreeWidget import TreeItem
diff --git a/Lib/idlelib/TreeWidget.py b/Lib/idlelib/TreeWidget.py
--- 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
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -479,6 +479,8 @@
 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.

-- 
Repository URL: http://hg.python.org/cpython