update demo scripts to use addr tuples for bind and connect

jeremyhylton · jeremyhylton · commit a8d30d5d667b · 2000-08-25T15:38:41.000Z
closes bug #111928
diff --git a/Demo/sockets/finger.py b/Demo/sockets/finger.py
@@ -23,7 +23,7 @@
 #
 def finger(host, args):
 	s = socket(AF_INET, SOCK_STREAM)
-	s.connect(host, FINGER_PORT)
+	s.connect((host, FINGER_PORT))
 	s.send(args + '\n')
 	while 1:
 		buf = s.recv(1024)
diff --git a/Demo/sockets/ftp.py b/Demo/sockets/ftp.py
@@ -48,7 +48,7 @@ def control(hostname):
 	# Create control connection
 	#
 	s = socket(AF_INET, SOCK_STREAM)
-	s.connect(hostname, FTP_PORT)
+	s.connect((hostname, FTP_PORT))
 	f = s.makefile('r') # Reading the replies is easier from a file...
 	#
 	# Control loop
@@ -79,7 +79,7 @@ def newdataport(s, f):
 	port = nextport + FTP_DATA_PORT
 	nextport = (nextport+1) % 16
 	r = socket(AF_INET, SOCK_STREAM)
-	r.bind(gethostbyname(gethostname()), port)
+	r.bind((gethostbyname(gethostname()), port))
 	r.listen(1)
 	sendportcmd(s, f, port)
 	return r
diff --git a/Demo/sockets/rpythond.py b/Demo/sockets/rpythond.py
@@ -19,7 +19,7 @@ def main():
 	else:
 		port = PORT
 	s = socket(AF_INET, SOCK_STREAM)
-	s.bind('', port)
+	s.bind(('', port))
 	s.listen(1)
 	while 1:
 		conn, (remotehost, remoteport) = s.accept()
diff --git a/Demo/sockets/telnet.py b/Demo/sockets/telnet.py
@@ -51,7 +51,7 @@ def main():
 	s = socket(AF_INET, SOCK_STREAM)
 	#
 	try:
-		s.connect(host, port)
+		s.connect((host, port))
 	except error, msg:
 		sys.stderr.write('connect failed: ' + `msg` + '\n')
 		sys.exit(1)
diff --git a/Demo/sockets/throughput.py b/Demo/sockets/throughput.py
@@ -44,7 +44,7 @@ def server():
 	else:
 		port = MY_PORT
 	s = socket(AF_INET, SOCK_STREAM)
-	s.bind('', port)
+	s.bind(('', port))
 	s.listen(1)
 	print 'Server ready...'
 	while 1:
@@ -72,7 +72,7 @@ def client():
 	t1 = time.time()
 	s = socket(AF_INET, SOCK_STREAM)
 	t2 = time.time()
-	s.connect(host, port)
+	s.connect((host, port))
 	t3 = time.time()
 	i = 0
 	while i < count:
diff --git a/Demo/sockets/udpecho.py b/Demo/sockets/udpecho.py
@@ -33,7 +33,7 @@ def server():
 	else:
 		port = ECHO_PORT
 	s = socket(AF_INET, SOCK_DGRAM)
-	s.bind('', port)
+	s.bind(('', port))
 	print 'udp echo server ready'
 	while 1:
 		data, addr = s.recvfrom(BUFSIZE)
@@ -50,7 +50,7 @@ def client():
 		port = ECHO_PORT
 	addr = host, port
 	s = socket(AF_INET, SOCK_DGRAM)
-	s.bind('', 0)
+	s.bind(('', 0))
 	print 'udp echo client ready, reading stdin'
 	while 1:
 		line = sys.stdin.readline()

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`#`
`24`	`24`	`def finger(host, args):`
`25`	`25`	`s = socket(AF_INET, SOCK_STREAM)`
`26`		`- s.connect(host, FINGER_PORT)`
	`26`	`+ s.connect((host, FINGER_PORT))`
`27`	`27`	`s.send(args + '\n')`
`28`	`28`	`while 1:`
`29`	`29`	`buf = s.recv(1024)`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ def main():`
`51`	`51`	`s = socket(AF_INET, SOCK_STREAM)`
`52`	`52`	`#`
`53`	`53`	`try:`
`54`		`- s.connect(host, port)`
	`54`	`+ s.connect((host, port))`
`55`	`55`	`except error, msg:`
`56`	`56`	sys.stderr.write('connect failed: ' + `msg` + '\n')
`57`	`57`	`sys.exit(1)`