diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-09-06 21:24:35 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-09-06 21:24:35 (GMT) |
| commit | 238f5aa6a55e7b1193342453250955455998f0a4 (patch) | |
| tree | 4d27926fc3ab3348600705d6fd85079f8543578e /Lib/distutils/tests/test_build_ext.py | |
| parent | 87a2803eb4ba4592c7e497e8e06742690a6767ab (diff) | |
| parent | df0eb95b571321e6d47057f34b3afc3894476d3f (diff) | |
| download | cpython-238f5aa6a55e7b1193342453250955455998f0a4.zip cpython-238f5aa6a55e7b1193342453250955455998f0a4.tar.gz cpython-238f5aa6a55e7b1193342453250955455998f0a4.tar.bz2 | |
merge 3.4 (#22349)
Diffstat (limited to 'Lib/distutils/tests/test_build_ext.py')
| -rw-r--r-- | Lib/distutils/tests/test_build_ext.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index e995866..b9f407f 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -31,12 +31,11 @@ class BuildExtTestCase(TempdirManager, self.tmp_dir = self.mkdtemp() self.sys_path = sys.path, sys.path[:] sys.path.append(self.tmp_dir) - if sys.version > "2.6": - import site - self.old_user_base = site.USER_BASE - site.USER_BASE = self.mkdtemp() - from distutils.command import build_ext - build_ext.USER_BASE = site.USER_BASE + import site + self.old_user_base = site.USER_BASE + site.USER_BASE = self.mkdtemp() + from distutils.command import build_ext + build_ext.USER_BASE = site.USER_BASE def test_build_ext(self): global ALREADY_TESTED @@ -84,11 +83,10 @@ class BuildExtTestCase(TempdirManager, support.unload('xx') sys.path = self.sys_path[0] sys.path[:] = self.sys_path[1] - if sys.version > "2.6": - import site - site.USER_BASE = self.old_user_base - from distutils.command import build_ext - build_ext.USER_BASE = self.old_user_base + import site + site.USER_BASE = self.old_user_base + from distutils.command import build_ext + build_ext.USER_BASE = self.old_user_base super(BuildExtTestCase, self).tearDown() def test_solaris_enable_shared(self): |