diff options
| author | Giampaolo Rodola' <g.rodola@gmail.com> | 2012-10-19 11:40:28 (GMT) |
|---|---|---|
| committer | Giampaolo Rodola' <g.rodola@gmail.com> | 2012-10-19 11:40:28 (GMT) |
| commit | 2d51f687e133fb8141f1a6b5a6ac51c9d5eddf58 (patch) | |
| tree | ea3eab5c7bb2907899c5f0d9f48886024b0fb163 | |
| parent | 91044799f7c829404bff2191941f58c8ecbce897 (diff) | |
| download | cpython-2d51f687e133fb8141f1a6b5a6ac51c9d5eddf58.zip cpython-2d51f687e133fb8141f1a6b5a6ac51c9d5eddf58.tar.gz cpython-2d51f687e133fb8141f1a6b5a6ac51c9d5eddf58.tar.bz2 | |
Fix issue #16270: urllib may hang when used for retrieving files via FTP by using a context manager.
| -rw-r--r-- | Lib/urllib/request.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index d6f9f9a..64092cf 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -2212,13 +2212,7 @@ class ftpwrapper: return (ftpobj, retrlen) def endtransfer(self): - if not self.busy: - return self.busy = 0 - try: - self.ftp.voidresp() - except ftperrors(): - pass def close(self): self.keepalive = False @@ -129,6 +129,9 @@ Core and Builtins Library ------- +- Issue #16270: urllib may hang when used for retrieving files via FTP by using + a context manager. Patch by Giampaolo Rodola'. + - Issue #16176: Properly identify Windows 8 via platform.platform() - Issue #16114: The subprocess module no longer provides a misleading |