projects
/
services
/
python-requests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4966d9c
)
Correctly identify cert files.
author
Cory Benfield
<lukasaoz@gmail.com>
Wed, 19 Dec 2012 20:11:17 +0000
(20:11 +0000)
committer
Cory Benfield
<lukasaoz@gmail.com>
Wed, 19 Dec 2012 20:11:17 +0000
(20:11 +0000)
Resolves issue #1046.
requests/adapters.py
patch
|
blob
|
history
diff --git
a/requests/adapters.py
b/requests/adapters.py
index f06dd47d3a35184e148e92db92d2bed442b8985d..bd3c9553347989e2479fb12c32624fa5d74ee301 100644
(file)
--- 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: