update demo scripts to use addr tuples for bind and connect
closes bug #111928
diff --git a/Demo/sockets/finger.py b/Demo/sockets/finger.py
index b941d0e..0c2baed 100755
--- 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
index 2d49239..8260c52 100755
--- a/Demo/sockets/ftp.py
+++ b/Demo/sockets/ftp.py
@@ -48,7 +48,7 @@
# 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 @@
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
index e8cdaa9..1109a99 100755
--- a/Demo/sockets/rpythond.py
+++ b/Demo/sockets/rpythond.py
@@ -19,7 +19,7 @@
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
index e83ce55..ee7c43b 100755
--- a/Demo/sockets/telnet.py
+++ b/Demo/sockets/telnet.py
@@ -51,7 +51,7 @@
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
index 58975bf..fa250e7 100755
--- a/Demo/sockets/throughput.py
+++ b/Demo/sockets/throughput.py
@@ -44,7 +44,7 @@
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 @@
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
index 8fce547..4410165 100755
--- a/Demo/sockets/udpecho.py
+++ b/Demo/sockets/udpecho.py
@@ -33,7 +33,7 @@
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 @@
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()