Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Kenneth Reitz
2012-06-28 16:00:40 -07:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -237,7 +237,7 @@ Response Status Codes
We can check the response status code::
>>> r = requests.get("http://httpbin.org/get')
>>> r = requests.get('http://httpbin.org/get')
>>> r.status_code
200
+1 -1
View File
@@ -561,7 +561,7 @@ class Request(object):
conn.cert_reqs = 'CERT_NONE'
conn.ca_certs = None
if self.cert and self.verify:
if self.cert:
if len(self.cert) == 2:
conn.cert_file = self.cert[0]
conn.key_file = self.cert[1]