Merge from 3.2 (#9302 fix and other changes)

Doc/ACKS.txt

@@ -57,6 +57,7 @@ docs@python.org), and we'll be glad to correct the problem.
    * Carl Feynman
    * Dan Finnie
    * Hernán Martínez Foffani
+   * Michael Foord
    * Stefan Franke
    * Jim Fulton
    * Peter Funk
@@ -144,6 +145,7 @@ docs@python.org), and we'll be glad to correct the problem.
    * Ross Moore
    * Sjoerd Mullender
    * Dale Nagata
+   * Trent Nelson
    * Michal Nowikowski
    * Steffen Daode Nurpmeso
    * Ng Pheng Siong
@@ -186,6 +188,7 @@ docs@python.org), and we'll be glad to correct the problem.
    * Joakim Sernbrant
    * Justin Sheehy
    * Charlie Shepherd
+   * Yue Shuaijie
    * SilentGhost
    * Michael Simcich
    * Ionel Simionescu
@@ -230,5 +233,3 @@ docs@python.org), and we'll be glad to correct the problem.
    * Moshe Zadka
    * Milan Zamazal
    * Cheng Zhang
-   * Trent Nelson
-   * Michael Foord

Lib/distutils/tests/test_install.py

@@ -20,8 +20,7 @@ from distutils.tests import support
 
 
 def _make_ext_name(modname):
-    if os.name == 'nt':
-        if sys.executable.endswith('_d.exe'):
+    if os.name == 'nt' and sys.executable.endswith('_d.exe'):
         modname += '_d'
     return modname + sysconfig.get_config_var('SO')