From 8cb904b49d343a4f6ede534bdcfdf7b614ea77e0 Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Wed, 19 Dec 2012 20:11:17 +0000 Subject: [PATCH 1/3] Correctly identify cert files. Resolves issue #1046. --- requests/adapters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/adapters.py b/requests/adapters.py index f06dd47d..bd3c9553 100644 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -75,7 +75,7 @@ class HTTPAdapter(BaseAdapter): conn.ca_certs = None if cert: - if len(cert) == 2: + if isinstance(cert, basestring): conn.cert_file = cert[0] conn.key_file = cert[1] else: From f1ba27faa2b9b1a26e6c935c18acd6fcd9e7e164 Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Wed, 19 Dec 2012 20:26:41 +0000 Subject: [PATCH 2/3] Fix stupid, stupid logic error. --- requests/adapters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/adapters.py b/requests/adapters.py index bd3c9553..383ea9ab 100644 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -75,7 +75,7 @@ class HTTPAdapter(BaseAdapter): conn.ca_certs = None if cert: - if isinstance(cert, basestring): + if not isinstance(cert, basestring): conn.cert_file = cert[0] conn.key_file = cert[1] else: From 09da1921ffbd9cfd4dff83ca440cc49b087c732c Mon Sep 17 00:00:00 2001 From: Cory Benfield Date: Wed, 19 Dec 2012 21:37:47 +0000 Subject: [PATCH 3/3] Import basestring. --- requests/adapters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requests/adapters.py b/requests/adapters.py index 383ea9ab..44e0786c 100644 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -13,7 +13,7 @@ import socket from .models import Response from .packages.urllib3.poolmanager import PoolManager, proxy_from_url from .hooks import dispatch_hook -from .compat import urlparse +from .compat import urlparse, basestring from .utils import DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers from .structures import CaseInsensitiveDict from .packages.urllib3.exceptions import MaxRetryError