[Python-checkins] distutils2: Changed test.test_support import to test.support when running on Python 3

[tarek.ziade]

http://hg.python.org/distutils2/rev/f19a72623297
changeset:   1103:f19a72623297
user:        Arc Riley <arcriley at gmail.com>
date:        Thu Nov 25 06:27:15 2010 -0500
summary:
  Changed test.test_support import to test.support when running on Python 3

files:
  distutils2/_backport/tests/test_pkgutil.py
  distutils2/_backport/tests/test_sysconfig.py
  distutils2/tests/__init__.py

diff --git a/distutils2/_backport/tests/test_pkgutil.py b/distutils2/_backport/tests/test_pkgutil.py
--- a/distutils2/_backport/tests/test_pkgutil.py
+++ b/distutils2/_backport/tests/test_pkgutil.py
@@ -12,9 +12,7 @@
 except ImportError:
     from distutils2._backport.hashlib import md5
 
-from test.test_support import TESTFN
-
-from distutils2.tests import unittest, run_unittest, support
+from distutils2.tests import unittest, run_unittest, support, TESTFN
 from distutils2._backport import pkgutil
 
 try:
diff --git a/distutils2/_backport/tests/test_sysconfig.py b/distutils2/_backport/tests/test_sysconfig.py
--- a/distutils2/_backport/tests/test_sysconfig.py
+++ b/distutils2/_backport/tests/test_sysconfig.py
@@ -14,9 +14,9 @@
         get_config_var, get_config_vars, get_path, get_paths, get_platform,
         get_scheme_names, _main, _SCHEMES)
 
-from distutils2.tests import unittest
+from distutils2.tests import unittest, TESTFN, unlink
 from distutils2.tests.support import EnvironGuard
-from test.test_support import TESTFN, unlink
+
 try:
     from test.test_support import skip_unless_symlink
 except ImportError:
diff --git a/distutils2/tests/__init__.py b/distutils2/tests/__init__.py
--- a/distutils2/tests/__init__.py
+++ b/distutils2/tests/__init__.py
@@ -30,8 +30,11 @@
     except ImportError:
         sys.exit('Error: You have to install unittest2')
 
-
-from test.test_support import TESTFN    # use TESTFN from stdlib/test_support.
+# use TESTFN from stdlib, pull in unlink for other modules to use as well
+if sys.version_info[0] == 3:
+  from test.support import TESTFN, unlink
+else :
+  from test.test_support import TESTFN, unlink
 
 here = os.path.dirname(__file__) or os.curdir
 

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