Mass check-in after untabifying all files that need it.

1 files changed, 55 insertions, 55 deletions

diff --git a/Lib/popen2.py b/Lib/popen2.py
index d62f6a9..4c42958 100644
--- a/Lib/popen2.py
+++ b/Lib/popen2.py
@@ -2,71 +2,71 @@ import os
 import sys
 import string
 
-MAXFD = 256	# Max number of file descriptors (os.getdtablesize()???)
+MAXFD = 256     # Max number of file descriptors (os.getdtablesize()???)
 
 _active = []
 
 def _cleanup():
     for inst in _active[:]:
-	inst.poll()
+        inst.poll()
 
 class Popen3:
     def __init__(self, cmd, capturestderr=0, bufsize=-1):
-	if type(cmd) == type(''):
-	    cmd = ['/bin/sh', '-c', cmd]
-	p2cread, p2cwrite = os.pipe()
-	c2pread, c2pwrite = os.pipe()
-	if capturestderr:
-	    errout, errin = os.pipe()
-	self.pid = os.fork()
-	if self.pid == 0:
-	    # Child
-	    os.close(0)
-	    os.close(1)
-	    if os.dup(p2cread) <> 0:
-		sys.stderr.write('popen2: bad read dup\n')
-	    if os.dup(c2pwrite) <> 1:
-		sys.stderr.write('popen2: bad write dup\n')
-	    if capturestderr:
-		os.close(2)
-		if os.dup(errin) <> 2: pass
-	    for i in range(3, MAXFD):
-		try:
-		    os.close(i)
-		except: pass
-	    try:
-		os.execvp(cmd[0], cmd)
-	    finally:
-		os._exit(1)
-	    # Shouldn't come here, I guess
-	    os._exit(1)
-	os.close(p2cread)
-	self.tochild = os.fdopen(p2cwrite, 'w', bufsize)
-	os.close(c2pwrite)
-	self.fromchild = os.fdopen(c2pread, 'r', bufsize)
-	if capturestderr:
-	    os.close(errin)
-	    self.childerr = os.fdopen(errout, 'r', bufsize)
-	else:
-	    self.childerr = None
-	self.sts = -1 # Child not completed yet
-	_active.append(self)
+        if type(cmd) == type(''):
+            cmd = ['/bin/sh', '-c', cmd]
+        p2cread, p2cwrite = os.pipe()
+        c2pread, c2pwrite = os.pipe()
+        if capturestderr:
+            errout, errin = os.pipe()
+        self.pid = os.fork()
+        if self.pid == 0:
+            # Child
+            os.close(0)
+            os.close(1)
+            if os.dup(p2cread) <> 0:
+                sys.stderr.write('popen2: bad read dup\n')
+            if os.dup(c2pwrite) <> 1:
+                sys.stderr.write('popen2: bad write dup\n')
+            if capturestderr:
+                os.close(2)
+                if os.dup(errin) <> 2: pass
+            for i in range(3, MAXFD):
+                try:
+                    os.close(i)
+                except: pass
+            try:
+                os.execvp(cmd[0], cmd)
+            finally:
+                os._exit(1)
+            # Shouldn't come here, I guess
+            os._exit(1)
+        os.close(p2cread)
+        self.tochild = os.fdopen(p2cwrite, 'w', bufsize)
+        os.close(c2pwrite)
+        self.fromchild = os.fdopen(c2pread, 'r', bufsize)
+        if capturestderr:
+            os.close(errin)
+            self.childerr = os.fdopen(errout, 'r', bufsize)
+        else:
+            self.childerr = None
+        self.sts = -1 # Child not completed yet
+        _active.append(self)
     def poll(self):
-	if self.sts < 0:
-	    try:
-		pid, sts = os.waitpid(self.pid, os.WNOHANG)
-		if pid == self.pid:
-		    self.sts = sts
-		    _active.remove(self)
-	    except os.error:
-		pass
-	return self.sts
+        if self.sts < 0:
+            try:
+                pid, sts = os.waitpid(self.pid, os.WNOHANG)
+                if pid == self.pid:
+                    self.sts = sts
+                    _active.remove(self)
+            except os.error:
+                pass
+        return self.sts
     def wait(self):
-	pid, sts = os.waitpid(self.pid, 0)
-	if pid == self.pid:
-	    self.sts = sts
-	    _active.remove(self)
-	return self.sts
+        pid, sts = os.waitpid(self.pid, 0)
+        if pid == self.pid:
+            self.sts = sts
+            _active.remove(self)
+        return self.sts
 
 def popen2(cmd, bufsize=-1):
     _cleanup()