1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove __del__ methods to avoid creating uncollectable cyclic trash.

Browse Source 
Keep close() methods for backwards compatibility.

Does any call close() explicitly?
This commit is contained in:
Jeremy Hylton 2003-12-15 16:08:48 +00:00
parent 6485a87b9a
commit dce391cb39
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Lib/urllib2.py
View File

@ -170,12 +170,6 @@ class HTTPError(URLError, addinfourl):
def __str__(self): def __str__(self):
return 'HTTP Error %s: %s' % (self.code, self.msg) return 'HTTP Error %s: %s' % (self.code, self.msg)
def __del__(self):
# XXX is this safe? what if user catches exception, then
# extracts fp and discards exception?
if self.fp:
self.fp.close()
class GopherError(URLError): class GopherError(URLError):
pass pass
@ -307,13 +301,9 @@ class OpenerDirector:
bisect.insort(self.handlers, handler) bisect.insort(self.handlers, handler)
handler.add_parent(self) handler.add_parent(self)
def __del__(self):
self.close()
def close(self): def close(self):
for handler in self.handlers: # Only exists for backwards compatibility.
handler.close() pass
self.handlers = []
def _call_chain(self, chain, kind, meth_name, *args): def _call_chain(self, chain, kind, meth_name, *args):
# XXX raise an exception if no one else should try to handle # XXX raise an exception if no one else should try to handle
@ -436,7 +426,8 @@ class BaseHandler:
self.parent = parent self.parent = parent
def close(self): def close(self):
self.parent = None # Only exists for backwards compatibility
pass
def __lt__(self, other): def __lt__(self, other):
if not hasattr(other, "handler_order"): if not hasattr(other, "handler_order"):