diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-10 10:24:41 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-04-10 10:24:41 (GMT) |
| commit | 7e7a3dba5fd4262269f713dfe21ba7e4746fc2dd (patch) | |
| tree | a0777a3e70ae76f294fac756c684ec4e24d5df1d /Lib/urllib | |
| parent | 842f00e72509db50957ceb00d289b305dbc5a0a5 (diff) | |
| download | cpython-7e7a3dba5fd4262269f713dfe21ba7e4746fc2dd.zip cpython-7e7a3dba5fd4262269f713dfe21ba7e4746fc2dd.tar.gz cpython-7e7a3dba5fd4262269f713dfe21ba7e4746fc2dd.tar.bz2 | |
Issue #23865: close() methods in multiple modules now are idempotent and more
robust at shutdown. If needs to release multiple resources, they are released
even if errors are occured.
Diffstat (limited to 'Lib/urllib')
| -rw-r--r-- | Lib/urllib/response.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Lib/urllib/response.py b/Lib/urllib/response.py index 4a143b0..4778118 100644 --- a/Lib/urllib/response.py +++ b/Lib/urllib/response.py @@ -43,11 +43,15 @@ class addclosehook(addbase): self.hookargs = hookargs def close(self): - if self.closehook: - self.closehook(*self.hookargs) - self.closehook = None - self.hookargs = None - super(addclosehook, self).close() + try: + closehook = self.closehook + hookargs = self.hookargs + if closehook: + self.closehook = None + self.hookargs = None + closehook(*hookargs) + finally: + super(addclosehook, self).close() class addinfo(addbase): |