Skip to content

bpo-36918: Don't close the object which is again closed by destructor #13317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tirkarthi wants to merge 3 commits into from
Closed

bpo-36918: Don't close the object which is again closed by destructor #13317

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
510350e
Don't close the object which is again closed by destructor
tirkarthi May 14, 2019
064ec25
Revert "Don't close the object which is again closed by destructor"
tirkarthi May 14, 2019
134f2be
Mock close function to silence destructor errors
tirkarthi May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Lib/test/test_urllib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,8 @@ def test_read_bogus(self):
Content-Type: text/html; charset=iso-8859-1
''')
try:
# Silence destructor error
http.client.HTTPConnection.close = lambda self: None
Copy link
Member

@serhiy-storchaka serhiy-storchaka May 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will affect all instances of HTTPConnection.

Copy link
Member Author

@tirkarthi tirkarthi May 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fakehttp replaces http.client.HTTPConnection with FakeHTTPConnection and unfakehttp restores the old value of http.client.HTTPConnection at the end of test. So I guess it's changing close on FakeHTTPConnection which is generated per test.

https://github.com/python/cpython/pull/13317/files#diff-618652ed25a24a1b635417b4264c9533L101

Copy link
Contributor

@asvetlov asvetlov May 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think @tirkarthi is right.

Copy link
Member

@vstinner vstinner May 27, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not adding a close() method to FakeHTTPConnection?

Copy link
Member Author

@tirkarthi tirkarthi Jun 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are no test case failures on changing close in FakeHTTPConnection but I haven't had time to analyze it well to see if there are any other cases it affects. So I kept the change minimal to have reported tests silenced.

Copy link
Member

@vstinner vstinner Jun 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After I wrote a similar change, I now understand this change and I agree that it's correct. But the change is surprising :-) I wrote PR #13996 which adds a "mock_close" attribute to fake_http(): if mock_close is true, a close() method which does nothing is defined. IMHO it's less surprising, since it's more explicitly that only the mock is affected.

self.assertRaises(OSError, urlopen, "http://python.org/")
finally:
self.unfakehttp()
Expand All @@ -416,6 +418,8 @@ def test_invalid_redirect(self):
Content-Type: text/html; charset=iso-8859-1
''')
try:
# Silence destructor error
http.client.HTTPConnection.close = lambda self: None
msg = "Redirection to url 'file:"
with self.assertRaisesRegex(urllib.error.HTTPError, msg):
urlopen("http://python.org/")
Expand All @@ -431,6 +435,8 @@ def test_redirect_limit_independent(self):
Connection: close
''')
try:
# Silence destructor error
http.client.HTTPConnection.close = lambda self: None
self.assertRaises(urllib.error.HTTPError, urlopen,
"http://something")
finally:
Expand Down