[pypy-svn] r39260 - pypy/dist/lib-python/modified-2.4.1

[ac at codespeak.net]

Author: ac
Date: Wed Feb 21 10:55:04 2007
New Revision: 39260

Modified:
   pypy/dist/lib-python/modified-2.4.1/socket.py
Log:
Slightly more robust refounting.

Modified: pypy/dist/lib-python/modified-2.4.1/socket.py
==============================================================================
--- pypy/dist/lib-python/modified-2.4.1/socket.py	(original)
+++ pypy/dist/lib-python/modified-2.4.1/socket.py	Wed Feb 21 10:55:04 2007
@@ -232,12 +232,14 @@
     closed = property(_getclosed, doc="True if the file is closed")
 
     def close(self):
-        try:
-            if self._sock:
+        if self._sock:
+            try:
                 self.flush()
-                self._sock._drop()
-        finally:
-            self._sock = None
+            finally:
+                if self._sock:
+                    s = self._sock
+                    self._sock = None
+                    s._drop()
 
     def __del__(self):
         try: