[Jython-checkins] SF.net SVN: jython:[5483] trunk/jython/Lib

[<pj...@us...>]

Revision: 5483
          http://jython.svn.sourceforge.net/jython/?rev=5483&view=rev
Author:   pjenvey
Date:     2008-10-20 20:01:14 +0000 (Mon, 20 Oct 2008)

Log Message:
-----------
make sock.listen() explicitly require the backlog argument to match CPython

Modified Paths:
--------------
    trunk/jython/Lib/socket.py
    trunk/jython/Lib/test/test_socket.py

Modified: trunk/jython/Lib/socket.py
===================================================================
--- trunk/jython/Lib/socket.py	2008-10-20 17:19:57 UTC (rev 5482)
+++ trunk/jython/Lib/socket.py	2008-10-20 20:01:14 UTC (rev 5483)
@@ -699,7 +699,7 @@
         _unpack_address_tuple(addr)
         self.local_addr = addr
 
-    def listen(self, backlog=50):
+    def listen(self, backlog):
         "This signifies a server socket"
         try:
             assert not self.sock_impl

Modified: trunk/jython/Lib/test/test_socket.py
===================================================================
--- trunk/jython/Lib/test/test_socket.py	2008-10-20 17:19:57 UTC (rev 5482)
+++ trunk/jython/Lib/test/test_socket.py	2008-10-20 20:01:14 UTC (rev 5483)
@@ -543,7 +543,7 @@
             # First listen on a server socket, so that the connection won't be refused.
             server_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             server_sock.bind( (HOST, PORT) )
-            server_sock.listen()
+            server_sock.listen(50)
             # Now do the tests
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             self._testSetAndGetOption(sock, option, values)
@@ -564,7 +564,7 @@
             self._testSetAndGetOption(sock, option, values)
             # now bind and listen on the socket i.e. cause the implementation socket to be created
             sock.bind( (HOST, PORT) )
-            sock.listen()
+            sock.listen(50)
             self.failUnlessEqual(sock.getsockopt(socket.SOL_SOCKET, option), values[-1], \
                  "Option value '%s'='%s' did not propagate to implementation socket" % (option, values[-1]))
             self._testSetAndGetOption(sock, option, values)
@@ -1410,12 +1410,12 @@
     def testBindException(self):
         # First bind to the target port
         self.s.bind( (HOST, PORT) )
-        self.s.listen()
+        self.s.listen(50)
         try:
             # And then try to bind again
             t = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             t.bind( (HOST, PORT) )
-            t.listen()
+            t.listen(50)
         except socket.error, se:
             self.failUnlessEqual(se[0], errno.EADDRINUSE)
         except Exception, x:
@@ -1493,7 +1493,7 @@
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
     def testShutdownIOOnListener(self):
-        self.socket.listen() # socket is now a server socket
+        self.socket.listen(50) # socket is now a server socket
         try:
             self.socket.shutdown(socket.SHUT_RDWR)
         except Exception, x:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.