Skip to content
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.

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

Closes session in find_first_response #140

Merged
merged 2 commits into from
Oct 26, 2017
Merged
Changes from all commits
Commits
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
28 changes: 13 additions & 15 deletions tldextract/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,21 +28,19 @@ def find_first_response(urls, cache_fetch_timeout=None):
""" Decode the first successfully fetched URL, from UTF-8 encoding to
Python unicode.
"""
text = ''

session = requests.Session()
session.mount('file://', FileAdapter())

for url in urls:
try:
text = session.get(url, timeout=cache_fetch_timeout).text
except requests.exceptions.RequestException:
LOG.exception(
'Exception reading Public Suffix List url %s',
url
)
else:
return _decode_utf8(text)
with requests.Session() as session:
session.mount('file://', FileAdapter())

for url in urls:
try:
text = session.get(url, timeout=cache_fetch_timeout).text
except requests.exceptions.RequestException:
LOG.exception(
'Exception reading Public Suffix List url %s',
url
)
else:
return _decode_utf8(text)

LOG.error(
'No Public Suffix List found. Consider using a mirror or constructing '
Expand Down