Skip to content

Commit 448231f

Browse files
committed
gh-98778: Update HTTPError to initialize properly even if fp is None
1 parent ee60156 commit 448231f

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

Lib/tempfile.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,8 @@ def cleanup(self, windows=(_os.name == 'nt'), unlink=_os.unlink):
433433
try:
434434
if not self.close_called:
435435
self.close_called = True
436-
self.file.close()
436+
if self.file is not None:
437+
self.file.close()
437438
finally:
438439
# Windows provides delete-on-close as a primitive, in which
439440
# case the file was deleted by self.file.close().
@@ -447,7 +448,8 @@ def close(self):
447448
if not self.close_called:
448449
self.close_called = True
449450
try:
450-
self.file.close()
451+
if self.file is not None:
452+
self.file.close()
451453
finally:
452454
if self.delete and self.delete_on_close:
453455
self.cleanup()

Lib/test/test_urllib2.py

+4
Original file line numberDiff line numberDiff line change
@@ -1824,6 +1824,10 @@ def test_HTTPError_interface(self):
18241824
expected_errmsg = '<HTTPError %s: %r>' % (err.code, err.msg)
18251825
self.assertEqual(repr(err), expected_errmsg)
18261826

1827+
def test_gh_98778(self):
1828+
x = urllib.error.HTTPError("url", 405, "METHOD NOT ALLOWED", None, None)
1829+
self.assertEqual(getattr(x, "__notes__", ()), ())
1830+
18271831
def test_parse_proxy(self):
18281832
parse_proxy_test_cases = [
18291833
('proxy.example.com',

Lib/urllib/error.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,7 @@ def __init__(self, url, code, msg, hdrs, fp):
4242
self.hdrs = hdrs
4343
self.fp = fp
4444
self.filename = url
45-
# The addinfourl classes depend on fp being a valid file
46-
# object. In some cases, the HTTPError may not have a valid
47-
# file object. If this happens, the simplest workaround is to
48-
# not initialize the base classes.
49-
if fp is not None:
50-
self.__super_init(fp, hdrs, url, code)
45+
self.__super_init(fp, hdrs, url, code)
5146

5247
def __str__(self):
5348
return 'HTTP Error %s: %s' % (self.code, self.msg)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Update :exc:`~urllib.error.HTTPError` to be initialized properly, even if
2+
the ``fp`` is ``None``. Patch by Dong-hee Na.

0 commit comments

Comments
 (0)