--- C:\apps\Python24\Lib\CGIHTTPServer-old.py Mon Aug
30 09:38:16 2004
+++ C:\apps\Python24\Lib\CGIHTTPServer.py Tue Jan 10
19:45:09 2005
@@ -234,18 +234,16 @@
 
         elif self.have_popen2 or self.have_popen3:
             # Windows -- use popen2 or popen3 to
create a subprocess
+            import subprocess
             import shutil
-            if self.have_popen3:
-                popenx = os.popen3
-            else:
-                popenx = os.popen2
-            cmdline = scriptfile
+
+            cmdline = '"%s"' % scriptfile
             if self.is_python(scriptfile):
                 interp = sys.executable
                 if interp.lower().endswith("w.exe"):
                     # On Windows, use python.exe, not
pythonw.exe
                     interp = interp[:-5] + interp[-4:]
-                cmdline = "%s -u %s" % (interp, cmdline)
+                cmdline = '"%s" -u %s' % (interp, cmdline)
             if '=' not in query and '"' not in query:
                 cmdline = '%s "%s"' % (cmdline, query)
             self.log_message("command: %s", cmdline)
@@ -253,11 +251,11 @@
                 nbytes = int(length)
             except (TypeError, ValueError):
                 nbytes = 0
-            files = popenx(cmdline, 'b')
-            fi = files[0]
-            fo = files[1]
-            if self.have_popen3:
-                fe = files[2]
+
+            p = subprocess.Popen(cmdline,
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+                                
stderr=subprocess.PIPE, env=os.environ)
+            (fi, fo, fe) = (p.stdin, p.stdout, p.stderr)
+
             if self.command.lower() == "post" and
nbytes > 0:
                 data = self.rfile.read(nbytes)
                 fi.write(data)
@@ -267,16 +265,16 @@
                     break
             fi.close()
             shutil.copyfileobj(fo, self.wfile)
-            if self.have_popen3:
-                errors = fe.read()
-                fe.close()
-                if errors:
-                    self.log_error('%s', errors)
+            errors = fe.read()
+            fe.close()
+            if errors:
+                self.log_error('%s', errors)
             sts = fo.close()
             if sts:
                 self.log_error("CGI script exit status
%#x", sts)
             else:
                 self.log_message("CGI script exited OK")
+            del p
 
         else:
             # Other O.S. -- execute script in this process