From: Jack Jansen <jack.jansen@cwi.nl>
Date: Thu, 19 Jan 1995 11:49:05 +0000 (+0000)
Subject: Fixed listen()/getsockname() bug
X-Git-Tag: v1.2b3~149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f90a113176df262aa7d495a57bdc0d09c8ac09bb;p=thirdparty%2FPython%2Fcpython.git

Fixed listen()/getsockname() bug
---

diff --git a/Mac/Unsupported/mactcp/socket.py b/Mac/Unsupported/mactcp/socket.py
index 852a653ffe0c..3782eb5941c8 100644
--- a/Mac/Unsupported/mactcp/socket.py
+++ b/Mac/Unsupported/mactcp/socket.py
@@ -125,9 +125,9 @@ class _tcpsocket(_socket):
 		self.stream.ActiveOpen(self.port, _ipaddress(host), port)
 		
 	def getsockname(self):
-		st = self.stream.Status()
-		host = macdnr.AddrToStr(st.localHost)
-		return host, st.localPort
+		host, port = self.stream.GetSockName()
+		host = macdnr.AddrToStr(host)
+		return host, port
 		
 	def getpeername(self):
 		st = self.stream.Status()
@@ -147,9 +147,6 @@ class _tcpsocket(_socket):
 		if not self.databuf:
 			try:
 				self.databuf, urg, mark = self.stream.Rcv(0)
-				if not self.databuf:
-					print '** socket: no data!'
-				print '** recv: got ', len(self.databuf)
 			except mactcp.error, arg:
 				if arg[0] != MACTCP.connectionClosing:
 					raise mactcp.error, arg
@@ -211,7 +208,6 @@ class _socketfile:
 			i = string.index(self.buf, '\n')
 			rv = self.buf[:i+1]
 			self.buf = self.buf[i+1:]
-		print '** Readline:',self, `rv`
 		return rv
 			
 	def write(self, buf):