Merge branch '3.0' of github.com:requests/requests into 3.0

This commit is contained in:
2018-03-14 17:29:06 -04:00
+2 -2
View File
@@ -44,7 +44,7 @@ import warnings
from .exceptions import RequestsDependencyWarning
def check_compatibility(urllib3_version, chardet_version):
def check_compatibility(urllib3_version: str, chardet_version: str) -> None:
urllib3_version = urllib3_version.split('.')
assert urllib3_version != ['dev'] # Verify urllib3 isn't installed from git.
# Sometimes, urllib3 only reports its version as 16.1.
@@ -66,7 +66,7 @@ def check_compatibility(urllib3_version, chardet_version):
assert patch >= 2
def _check_cryptography(cryptography_version):
def _check_cryptography(cryptography_version: str) -> None:
# cryptography < 1.3.4
try:
cryptography_version = list(map(int, cryptography_version.split('.')))