Whitespace normalization. Ran reindent.py over the entire source tree.

Demo/sockets/ftp.py

@@ -37,35 +37,35 @@ FTP_DATA_PORT = FTP_DATA_PORT + 50000
 # Main program (called at the end of this file).
 #
 def main():
-	hostname = sys.argv[1]
-	control(hostname)
+    hostname = sys.argv[1]
+    control(hostname)
 
 
 # Control process (user interface and user protocol interpreter).
 #
 def control(hostname):
-	#
-	# Create control connection
-	#
-	s = socket(AF_INET, SOCK_STREAM)
-	s.connect((hostname, FTP_PORT))
-	f = s.makefile('r') # Reading the replies is easier from a file...
-	#
-	# Control loop
-	#
-	r = None
-	while 1:
-		code = getreply(f)
-		if code in ('221', 'EOF'): break
-		if code == '150':
-			getdata(r)
-			code = getreply(f)
-			r = None
-		if not r:
-			r = newdataport(s, f)
-		cmd = getcommand()
-		if not cmd: break
-		s.send(cmd + '\r\n')
+    #
+    # Create control connection
+    #
+    s = socket(AF_INET, SOCK_STREAM)
+    s.connect((hostname, FTP_PORT))
+    f = s.makefile('r') # Reading the replies is easier from a file...
+    #
+    # Control loop
+    #
+    r = None
+    while 1:
+        code = getreply(f)
+        if code in ('221', 'EOF'): break
+        if code == '150':
+            getdata(r)
+            code = getreply(f)
+            r = None
+        if not r:
+            r = newdataport(s, f)
+        cmd = getcommand()
+        if not cmd: break
+        s.send(cmd + '\r\n')
 
 
 # Create a new data port and send a PORT command to the server for it.
@@ -75,27 +75,27 @@ def control(hostname):
 nextport = 0
 #
 def newdataport(s, f):
-	global nextport
-	port = nextport + FTP_DATA_PORT
-	nextport = (nextport+1) % 16
-	r = socket(AF_INET, SOCK_STREAM)
-	r.bind((gethostbyname(gethostname()), port))
-	r.listen(1)
-	sendportcmd(s, f, port)
-	return r
+    global nextport
+    port = nextport + FTP_DATA_PORT
+    nextport = (nextport+1) % 16
+    r = socket(AF_INET, SOCK_STREAM)
+    r.bind((gethostbyname(gethostname()), port))
+    r.listen(1)
+    sendportcmd(s, f, port)
+    return r
 
 
 # Send an appropriate port command.
 #
 def sendportcmd(s, f, port):
-	hostname = gethostname()
-	hostaddr = gethostbyname(hostname)
-	hbytes = string.splitfields(hostaddr, '.')
-	pbytes = [repr(port/256), repr(port%256)]
-	bytes = hbytes + pbytes
-	cmd = 'PORT ' + string.joinfields(bytes, ',')
-	s.send(cmd + '\r\n')
-	code = getreply(f)
+    hostname = gethostname()
+    hostaddr = gethostbyname(hostname)
+    hbytes = string.splitfields(hostaddr, '.')
+    pbytes = [repr(port/256), repr(port%256)]
+    bytes = hbytes + pbytes
+    cmd = 'PORT ' + string.joinfields(bytes, ',')
+    s.send(cmd + '\r\n')
+    code = getreply(f)
 
 
 # Process an ftp reply and return the 3-digit reply code (as a string).
@@ -105,40 +105,40 @@ def sendportcmd(s, f, port):
 # Any text while receiving the reply is echoed to the file.
 #
 def getreply(f):
-	line = f.readline()
-	if not line: return 'EOF'
-	print line,
-	code = line[:3]
-	if line[3:4] == '-':
-		while 1:
-			line = f.readline()
-			if not line: break # Really an error
-			print line,
-			if line[:3] == code and line[3:4] != '-': break
-	return code
+    line = f.readline()
+    if not line: return 'EOF'
+    print line,
+    code = line[:3]
+    if line[3:4] == '-':
+        while 1:
+            line = f.readline()
+            if not line: break # Really an error
+            print line,
+            if line[:3] == code and line[3:4] != '-': break
+    return code
 
 
 # Get the data from the data connection.
 #
 def getdata(r):
-	print '(accepting data connection)'
-	conn, host = r.accept()
-	print '(data connection accepted)'
-	while 1:
-		data = conn.recv(BUFSIZE)
-		if not data: break
-		sys.stdout.write(data)
-	print '(end of data connection)'
+    print '(accepting data connection)'
+    conn, host = r.accept()
+    print '(data connection accepted)'
+    while 1:
+        data = conn.recv(BUFSIZE)
+        if not data: break
+        sys.stdout.write(data)
+    print '(end of data connection)'
 
 # Get a command from the user.
 #
 def getcommand():
-	try:
-		while 1:
-			line = raw_input('ftp.py> ')
-			if line: return line
-	except EOFError:
-		return ''
+    try:
+        while 1:
+            line = raw_input('ftp.py> ')
+            if line: return line
+    except EOFError:
+        return ''
 
 
 # Call the main program.