Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r61514:b8956f10796f
Date: 2013-02-20 16:09 -0800
http://bitbucket.org/pypy/pypy/changeset/b8956f10796f/
Log: merge default
diff --git a/rpython/rlib/rsocket.py b/rpython/rlib/rsocket.py
--- a/rpython/rlib/rsocket.py
+++ b/rpython/rlib/rsocket.py
@@ -497,15 +497,8 @@
def __del__(self):
fd = self.fd
if fd != _c.INVALID_SOCKET:
- try:
- self._dealloc_warn()
- finally:
- self.fd = _c.INVALID_SOCKET
- _c.socketclose(fd)
-
- def _dealloc_warn(self):
- """Called when implicitly closed via the deconstructor"""
- pass
+ self.fd = _c.INVALID_SOCKET
+ _c.socketclose(fd)
if hasattr(_c, 'fcntl'):
def _setblocking(self, block):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
