From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 2 Aug 2010 20:47:06 +0000 (+0000)
Subject: Merged revisions 75408 via svnmerge from
X-Git-Tag: v2.6.6rc1~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ee50bba6b96c39ef775664a535c61c27b8e869f;p=thirdparty%2FPython%2Fcpython.git

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

........
  r75408 | antoine.pitrou | 2009-10-14 20:34:31 +0300 (Wed, 14 Oct 2009) | 3 lines

  Fix a test_atexit failure when run with -3
........
---

diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py
index 0ff6e53bdc5d..bf85b7525361 100644
--- a/Lib/test/test_atexit.py
+++ b/Lib/test/test_atexit.py
@@ -2,6 +2,7 @@ import sys
 import unittest
 import StringIO
 import atexit
+from imp import reload
 from test import test_support
 
 class TestCase(unittest.TestCase):