[Python-checkins] cpython (3.5): Moves distutils test import within skippable class.

larry.hastings python-checkins at python.org
Wed Sep 9 15:56:52 CEST 2015


https://hg.python.org/cpython/rev/1fb824c2e1d7
changeset:   97818:1fb824c2e1d7
branch:      3.5
parent:      97816:8374472c6a6e
user:        Steve Dower <steve.dower at microsoft.com>
date:        Tue Sep 08 23:42:51 2015 -0700
summary:
  Moves distutils test import within skippable class.

files:
  Lib/distutils/tests/test_msvccompiler.py |  7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Lib/distutils/tests/test_msvccompiler.py b/Lib/distutils/tests/test_msvccompiler.py
--- a/Lib/distutils/tests/test_msvccompiler.py
+++ b/Lib/distutils/tests/test_msvccompiler.py
@@ -3,8 +3,6 @@
 import unittest
 import os
 
-import distutils._msvccompiler as _msvccompiler
-
 from distutils.errors import DistutilsPlatformError
 from distutils.tests import support
 from test.support import run_unittest
@@ -18,6 +16,7 @@
                             unittest.TestCase):
 
     def test_no_compiler(self):
+        import distutils._msvccompiler as _msvccompiler
         # makes sure query_vcvarsall raises
         # a DistutilsPlatformError if the compiler
         # is not found
@@ -34,6 +33,7 @@
             _msvccompiler._find_vcvarsall = old_find_vcvarsall
 
     def test_compiler_options(self):
+        import distutils._msvccompiler as _msvccompiler
         # suppress path to vcruntime from _find_vcvarsall to
         # check that /MT is added to compile options
         old_find_vcvarsall = _msvccompiler._find_vcvarsall
@@ -50,6 +50,7 @@
             _msvccompiler._find_vcvarsall = old_find_vcvarsall
 
     def test_vcruntime_copy(self):
+        import distutils._msvccompiler as _msvccompiler
         # force path to a known file - it doesn't matter
         # what we copy as long as its name is not in
         # _msvccompiler._BUNDLED_DLLS
@@ -69,6 +70,8 @@
             _msvccompiler._find_vcvarsall = old_find_vcvarsall
 
     def test_vcruntime_skip_copy(self):
+        import distutils._msvccompiler as _msvccompiler
+
         tempdir = self.mkdtemp()
         compiler = _msvccompiler.MSVCCompiler()
         compiler.initialize()

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


More information about the Python-checkins mailing list