mirror of
https://github.com/python/cpython.git
synced 2024-11-28 12:31:14 +08:00
port from 3.2 - Fix the urllib closing issue which hangs on particular ftp urls/ftp servers. closes issue11199
This commit is contained in:
commit
3270d11d8a
@ -64,11 +64,11 @@ class addclosehook(addbase):
|
|||||||
self.hookargs = hookargs
|
self.hookargs = hookargs
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
addbase.close(self)
|
|
||||||
if self.closehook:
|
if self.closehook:
|
||||||
self.closehook(*self.hookargs)
|
self.closehook(*self.hookargs)
|
||||||
self.closehook = None
|
self.closehook = None
|
||||||
self.hookargs = None
|
self.hookargs = None
|
||||||
|
addbase.close(self)
|
||||||
|
|
||||||
class addinfo(addbase):
|
class addinfo(addbase):
|
||||||
"""class to add an info() method to an open file."""
|
"""class to add an info() method to an open file."""
|
||||||
|
@ -24,6 +24,8 @@ Core and Builtins
|
|||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #11199: Fix the with urllib which hangs on particular ftp urls.
|
||||||
|
|
||||||
- Issue #14222: Use the new time.steady() function instead of time.time() for
|
- Issue #14222: Use the new time.steady() function instead of time.time() for
|
||||||
timeout in queue and threading modules to not be affected of system time
|
timeout in queue and threading modules to not be affected of system time
|
||||||
update.
|
update.
|
||||||
|
Loading…
Reference in New Issue
Block a user