commit 3efafd77498def137f4afbcf2abee9aa2aed460a
author Ezio Melotti <ezio.melotti@gmail.com> Mon Aug 02 18:40:55 2010 +0000
committer Ezio Melotti <ezio.melotti@gmail.com> Mon Aug 02 18:40:55 2010 +0000
tree e491bca6f159d278f142478ad73b287cd20b958d
parent 5ff2745fed91dca3dca20360945562df70ed7767

Merged revisions 77942,79023 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77942 | ezio.melotti | 2010-02-03 07:37:26 +0200 (Wed, 03 Feb 2010) | 1 line

  #7092: Silence more py3k warnings. Patch by Florent Xicluna.
........
  r79023 | ezio.melotti | 2010-03-17 15:52:48 +0200 (Wed, 17 Mar 2010) | 1 line

  #7092: silence some more py3k warnings.
........

Lib/test/infinite_reload.py

diff --git a/Lib/test/infinite_reload.py b/Lib/test/infinite_reload.py
index bfbec91..841ccad 100644
--- a/Lib/test/infinite_reload.py
+++ b/Lib/test/infinite_reload.py
@@ -3,5 +3,6 @@
 #  reload()ing. This module is imported by test_import.py:test_infinite_reload
 #  to make sure this doesn't happen any more.
 
+import imp
 import infinite_reload
-reload(infinite_reload)
+imp.reload(infinite_reload)