summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-08-25 23:17:56 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-08-25 23:17:56 (GMT)
commit8d9dcd185c1f0716b20ecf5d3cb6fc4ef2c16874 (patch)
treeb79d348ceebdd5280f206962a0c4e707e1b7c529 /Lib/distutils
parent1329185890e4474d817f3c5d4df1aee70c29d35b (diff)
parent77443824f5ca8dea420e678668f55a6c73c27216 (diff)
downloadcpython-8d9dcd185c1f0716b20ecf5d3cb6fc4ef2c16874.zip
cpython-8d9dcd185c1f0716b20ecf5d3cb6fc4ef2c16874.tar.gz
cpython-8d9dcd185c1f0716b20ecf5d3cb6fc4ef2c16874.tar.bz2
Merge from 3.2 (#9302 fix and other changes)
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/tests/test_install.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
index 5c105af..dfc46b1 100644
--- a/Lib/distutils/tests/test_install.py
+++ b/Lib/distutils/tests/test_install.py
@@ -20,9 +20,8 @@ from distutils.tests import support
def _make_ext_name(modname):
- if os.name == 'nt':
- if sys.executable.endswith('_d.exe'):
- modname += '_d'
+ if os.name == 'nt' and sys.executable.endswith('_d.exe'):
+ modname += '_d'
return modname + sysconfig.get_config_var('SO')