diff options
| -rw-r--r-- | Lib/test/test_urllib.py | 5 | ||||
| -rw-r--r-- | Lib/urllib/request.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index 22ada56..5721296 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -268,6 +268,11 @@ Content-Type: text/html; charset=iso-8859-1 finally: self.unfakehttp() + def test_missing_localfile(self): + # Test for #10836 + with self.assertRaises(urllib.error.URLError): + urlopen('file://localhost/a/file/which/doesnot/exists.py') + def test_userpass_inurl(self): self.fakehttp(b"HTTP/1.0 200 OK\r\n\r\nHello!") try: diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 250d89e..79a7b40 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -1664,7 +1664,7 @@ class URLopener: return getattr(self, name)(url) else: return getattr(self, name)(url, data) - except HTTPError: + except (HTTPError, URLError): raise except socket.error as msg: raise IOError('socket error', msg).with_traceback(sys.exc_info()[2]) @@ -1891,7 +1891,7 @@ class URLopener: try: stats = os.stat(localname) except OSError as e: - raise URLError(e.errno, e.strerror, e.filename) + raise URLError(e.strerror, e.filename) size = stats.st_size modified = email.utils.formatdate(stats.st_mtime, usegmt=True) mtype = mimetypes.guess_type(url)[0] @@ -59,6 +59,9 @@ Core and Builtins Library ------- +- Issue #10836: Fix exception raised when file not found in urlretrieve + Initial patch by Ezio Melotti. + - Issue #14398: Fix size truncation and overflow bugs in the bz2 module. - Issue #12692: Fix resource leak in urllib.request when talking to an HTTP |