Fix two typos, one noted by Noah Spurrier in SF bug #475166, the

second noted after a second's thought about what the next line should
do. :-(

diff --git a/Lib/CGIHTTPServer.py b/Lib/CGIHTTPServer.py
index e8abd22c754507cf6459fa9cd6c6dcc334e027b1..e724601098de26c2f21e8c4ed15ab8f126238bf7 100644 (file)
--- a/Lib/CGIHTTPServer.py
+++ b/Lib/CGIHTTPServer.py
@@ -222,8 +222,8 @@ class CGIHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
             if self.is_python(scriptfile):
                 interp = sys.executable
                 if interp.lower().endswith("w.exe"):
-                    # On Windows, use python.exe, not python.exe
-                    interp = interp[:-5] = interp[-4:]
+                    # On Windows, use python.exe, not pythonw.exe
+                    interp = interp[:-5] + interp[-4:]
                 cmdline = "%s -u %s" % (interp, cmdline)
             if '=' not in query and '"' not in query:
                 cmdline = '%s "%s"' % (cmdline, query)

diff --git a/Misc/ACKS b/Misc/ACKS
index f6b73fe3a0d6c2df67ee3ccf51111187f4bf314e..022ec1ae60635184883eaa1cd85fbccebb09995d 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -397,6 +397,7 @@ Dirk Soede
 Paul Sokolovsky
 Clay Spence
 Per Spilling
+Noah Spurrier
 Greg Stein
 Dan Stromberg
 Nathan Sullivan