Skip to content

Commit

Permalink
Refer to supported Python versions in comments
Browse files Browse the repository at this point in the history
  • Loading branch information
pquentin committed Aug 24, 2018
1 parent 3cc35c8 commit 9d42c3d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/urllib3/connectionpool.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def _raise_timeout(self, err, url, timeout_value):
# Catch possible read timeouts thrown as SSL errors. If not the
# case, rethrow the original. We need to do this because of:
# http://bugs.python.org/issue10272
if 'timed out' in str(err) or 'did not complete (read)' in str(err): # Python 2.6
if 'timed out' in str(err) or 'did not complete (read)' in str(err): # Python < 2.7.4
raise ReadTimeoutError(self, url, "Read timed out. (read timeout=%s)" % timeout_value)

def _make_request(self, conn, method, url, timeout=_Default, chunked=False,
Expand Down
3 changes: 1 addition & 2 deletions src/urllib3/packages/ssl_match_hostname/_implementation.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
# ipaddress has been backported to 2.6+ in pypi. If it is installed on the
# system, use it to handle IPAddress ServerAltnames (this was added in
# python-3.5) otherwise only do DNS matching. This allows
# backports.ssl_match_hostname to continue to be used all the way back to
# python-2.4.
# backports.ssl_match_hostname to continue to be used in Python 2.7.
try:
import ipaddress
except ImportError:
Expand Down

0 comments on commit 9d42c3d

Please sign in to comment.