[pypy-svn] r61199 - pypy/trunk/lib-python/modified-2.5.2

[arigo at codespeak.net]

Author: arigo
Date: Wed Jan 21 16:49:24 2009
New Revision: 61199

Modified:
   pypy/trunk/lib-python/modified-2.5.2/socket.py
Log:
Fix for an abuse of socket._fileobject by urllib2.py.


Modified: pypy/trunk/lib-python/modified-2.5.2/socket.py
==============================================================================
--- pypy/trunk/lib-python/modified-2.5.2/socket.py	(original)
+++ pypy/trunk/lib-python/modified-2.5.2/socket.py	Wed Jan 21 16:49:24 2009
@@ -249,7 +249,11 @@
                     self._sock = None
                     if self._close:
                         s.close()
-                    s._drop()
+                    try:
+                        s._drop()
+                    except AttributeError:
+                        pass     # for the abuse of socket._fileobject from
+                                 # urllib2.py :-(
 
     def __del__(self):
         try: