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

[<am...@us...>]

Revision: 5325
          http://jython.svn.sourceforge.net/jython/?rev=5325&view=rev
Author:   amak
Date:     2008-09-13 18:31:07 +0000 (Sat, 13 Sep 2008)

Log Message:
-----------
Change of mind on behaviour when shutting down server sockets.

Instead to raising an exception, best to let the failure pass silently, as cpython does.

http://bugs.jython.org/issue1121

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-09-13 18:09:58 UTC (rev 5324)
+++ trunk/jython/Lib/socket.py	2008-09-13 18:31:07 UTC (rev 5325)
@@ -258,7 +258,7 @@
         try:
             self.jsocket.shutdownInput()
         except AttributeError, ax:
-            raise error(errno.ENOTCONN, "Transport endpoint is not connected") 
+            pass # Fail silently server sockets
         except java.lang.Exception, jlx:
             raise _map_exception(jlx)
 
@@ -266,7 +266,7 @@
         try:
             self.jsocket.shutdownOutput()
         except AttributeError, ax:
-            raise error(errno.ENOTCONN, "Transport endpoint is not connected") 
+            pass # Fail silently server sockets
         except java.lang.Exception, jlx:
             raise _map_exception(jlx)
 

Modified: trunk/jython/Lib/test/test_socket.py
===================================================================
--- trunk/jython/Lib/test/test_socket.py	2008-09-13 18:09:58 UTC (rev 5324)
+++ trunk/jython/Lib/test/test_socket.py	2008-09-13 18:31:07 UTC (rev 5325)
@@ -1474,12 +1474,10 @@
         self.socket.listen() # socket is now a server socket
         try:
             self.socket.shutdown(socket.SHUT_RDWR)
-        except socket.error, se:
-            self.failUnlessEqual(se[0], errno.ENOTCONN, "Shutdown on listening socket should have raised errno.ENOTCONN, not %s" % str(se[0]))
         except Exception, x:
-            self.fail("Shutdown on listening socket should have raised socket exception, not %s" % str(x))
+            self.fail("Shutdown on listening socket should not have raised socket exception, not %s" % str(x))
         else:
-            self.fail("Shutdown on listening socket should have raised socket exception")
+            pass
 
     def testShutdownOnUnconnectedSocket(self):
         try:


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