[Jython-checkins] SF.net SVN: jython:[5488] trunk/jython/Lib/socket.py

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

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

Log Message:
-----------
allow abuse of _fileobject by fixing its close() to act like CPython's when the
underlying _sock isn't a Jython socket. fixes test_urllib2net

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

Modified: trunk/jython/Lib/socket.py
===================================================================
--- trunk/jython/Lib/socket.py	2008-10-20 23:53:47 UTC (rev 5487)
+++ trunk/jython/Lib/socket.py	2008-10-20 23:54:14 UTC (rev 5488)
@@ -1114,9 +1114,12 @@
             if self._sock:
                 self.flush()
         finally:
-            if self._sock and isinstance(self._sock, _nonblocking_api_mixin):
-                self._sock.reference_count -= 1
-                if not self._sock.reference_count or self._close:
+            if self._sock:
+                if isinstance(self._sock, _nonblocking_api_mixin):
+                    self._sock.reference_count -= 1
+                    if not self._sock.reference_count or self._close:
+                        self._sock.close()
+                elif self._close:
                     self._sock.close()
             self._sock = None
 


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