*** empty log message ***

2 files changed, 7 insertions, 8 deletions

diff --git a/Demo/sockets/gopher.py b/Demo/sockets/gopher.py
index 625697b5e7..f30ab0f1c8 100755
--- a/Demo/sockets/gopher.py
+++ b/Demo/sockets/gopher.py
@@ -200,7 +200,7 @@ def browse_textfile(selector, host, port):
 	x = None
 	try:
 		p = os.popen('${PAGER-more}', 'w')
-		x = SaveLines().init(p)
+		x = SaveLines(p)
 		get_alt_textfile(selector, host, port, x.writeln)
 	except IOError, msg:
 		print 'IOError:', msg
@@ -209,7 +209,7 @@ def browse_textfile(selector, host, port):
 	f = open_savefile()
 	if not f:
 		return
-	x = SaveLines().init(f)
+	x = SaveLines(f)
 	try:
 		get_alt_textfile(selector, host, port, x.writeln)
 		print 'Done.'
@@ -252,7 +252,7 @@ def browse_binary(selector, host, port):
 	f = open_savefile()
 	if not f:
 		return
-	x = SaveWithProgress().init(f)
+	x = SaveWithProgress(f)
 	get_alt_binary(selector, host, port, x.write, 8*1024)
 	x.close()
 
@@ -268,9 +268,8 @@ typebrowser = {'0': browse_textfile, '1': browse_menu, \
 
 # Class used to save lines, appending a newline to each line
 class SaveLines:
-	def init(self, f):
+	def __init__(self, f):
 		self.f = f
-		return self
 	def writeln(self, line):
 		self.f.write(line + '\n')
 	def close(self):
@@ -280,9 +279,8 @@ class SaveLines:
 
 # Class used to save data while showing progress
 class SaveWithProgress:
-	def init(self, f):
+	def __init__(self, f):
 		self.f = f
-		return self
 	def write(self, data):
 		sys.stdout.write('#')
 		sys.stdout.flush()
diff --git a/Demo/sockets/radio.py b/Demo/sockets/radio.py
index 4bb55ff995..5905ff2a3c 100755
--- a/Demo/sockets/radio.py
+++ b/Demo/sockets/radio.py
@@ -9,5 +9,6 @@ s = socket(AF_INET, SOCK_DGRAM)
 s.bind('', MYPORT)
 
 while 1:
-	data = s.recv(1500)
+	data, wherefrom = s.recvfrom(1500, 0)
+	sys.stderr.write(`wherefrom` + '\n')
 	sys.stdout.write(data)