[Python-checkins] cpython (merge 3.3 -> default): Merge from 3.3

[nick.coghlan]

http://hg.python.org/cpython/rev/110878cd1c78
changeset:   79835:110878cd1c78
parent:      79833:bedcc790c6e7
parent:      79834:6da7a5c3080b
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Fri Oct 19 23:37:28 2012 +1000
summary:
  Merge from 3.3

files:
  Lib/test/test_import.py |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -15,7 +15,6 @@
 import errno
 import shutil
 import contextlib
-import time
 
 import test.support
 from test.support import (

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