summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-26 06:03:19 +0000
committerMartin Panter <vadmium+py@gmail.com>2016-05-26 06:03:19 +0000
commitbcd79d7f468be48a651afc1bb1842fab79285f0a (patch)
tree21ed19246964dd6252ffbef427ecf21795568406
parent82518cc8d2b130bb7b8b90f10140ad0c91d2c8ad (diff)
parent30a0d1c5414ec93ffd4f83cfcc67d426847ce30d (diff)
downloadpython-setuptools-git-bcd79d7f468be48a651afc1bb1842fab79285f0a.tar.gz
Issue #27076: Merge spelling from 3.5
-rw-r--r--msvc9compiler.py2
-rw-r--r--tests/test_unixccompiler.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/msvc9compiler.py b/msvc9compiler.py
index da4b21d2..0b1fd19f 100644
--- a/msvc9compiler.py
+++ b/msvc9compiler.py
@@ -51,7 +51,7 @@ else:
# A map keyed by get_platform() return values to values accepted by
# 'vcvarsall.bat'. Note a cross-compile may combine these (eg, 'x86_amd64' is
-# the param to cross-compile on x86 targetting amd64.)
+# the param to cross-compile on x86 targeting amd64.)
PLAT_TO_VCVARS = {
'win32' : 'x86',
'win-amd64' : 'amd64',
diff --git a/tests/test_unixccompiler.py b/tests/test_unixccompiler.py
index 7c95be56..efba27e1 100644
--- a/tests/test_unixccompiler.py
+++ b/tests/test_unixccompiler.py
@@ -126,7 +126,7 @@ class UnixCCompilerTestCase(unittest.TestCase):
self.assertEqual(self.cc.linker_so[0], 'my_cc')
@unittest.skipUnless(sys.platform == 'darwin', 'test only relevant for OS X')
- def test_osx_explict_ldshared(self):
+ def test_osx_explicit_ldshared(self):
# Issue #18080:
# ensure that setting CC env variable does not change
# explicit LDSHARED setting for linker