Skip to content

Upgrade for new requests version #1

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

Merged
prabcs merged 2 commits into from
Mar 2, 2018
Merged

Upgrade for new requests version #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
237fca0
explicit asking to get cacert.pem from certifi
prabcs Mar 2, 2018
426f8cc
installing certifi
prabcs Mar 2, 2018
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
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
LONG_DESCRIPTION_MD = __doc__
LONG_DESCRIPTION = re.sub(r'(?s)\[(.*?)\]\((http.*?)\)', r'\1', LONG_DESCRIPTION_MD)

INSTALL_REQUIRES = ["setuptools", "idna", "requests>=2.1.0", "requests-file>=1.4"]
INSTALL_REQUIRES = ["setuptools", "idna", "requests>=2.1.0", "requests-file>=1.4", "certifi>=2018.1.18"]
if (2, 7) > sys.version_info:
INSTALL_REQUIRES.append("argparse>=1.2.1")

Expand Down
7 changes: 6 additions & 1 deletion tldextract/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import sys

import requests
from pkg_resources import resource_filename
from requests_file import FileAdapter

# pylint: disable=import-error,invalid-name,no-name-in-module,redefined-builtin
Expand All @@ -33,7 +34,11 @@ def find_first_response(urls, cache_fetch_timeout=None):

for url in urls:
try:
text = session.get(url, timeout=cache_fetch_timeout).text
text = session.get(
url,
timeout=cache_fetch_timeout,
verify=resource_filename('certifi', 'cacert.pem')
).text
except requests.exceptions.RequestException:
LOG.exception(
'Exception reading Public Suffix List url %s',
Expand Down