[Python-checkins] cpython (merge 3.2 -> default): Issue #12408: Merge.

[mark.dickinson]

http://hg.python.org/cpython/rev/898c0c8ba8ca
changeset:   70967:898c0c8ba8ca
parent:      70964:1137f7021b95
parent:      70966:c5fca67a7e8c
user:        Mark Dickinson <mdickinson at enthought.com>
date:        Sat Jun 25 13:29:49 2011 +0200
summary:
  Issue #12408: Merge.

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


diff --git a/Lib/test/test_future5.py b/Lib/test/test_future5.py
--- a/Lib/test/test_future5.py
+++ b/Lib/test/test_future5.py
@@ -3,7 +3,7 @@
 
 import sys
 import unittest
-from . import support
+from test import support
 
 
 class TestMultipleFeatures(unittest.TestCase):

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