Merge branch 'develop' of github.com:kennethreitz/requests into develop

This commit is contained in:
Kenneth Reitz
2012-01-18 21:49:25 -05:00
3 changed files with 6 additions and 2 deletions
+1
View File
@@ -73,3 +73,4 @@ Patches and Suggestions
- Lucian Ursu
- Tom Moertel
- Frank Kumro Jr
- Chase Sterling
+3
View File
@@ -453,6 +453,9 @@ class Request(object):
conn.cert_reqs = 'CERT_REQUIRED'
conn.ca_certs = cert_loc
else:
conn.cert_reqs = 'CERT_NONE'
conn.ca_certs = None
if not self.sent or anyway:
+2 -2
View File
@@ -34,10 +34,10 @@ class RequestsTestSuite(unittest.TestCase):
s = requests.session()
s.get('https://kennethreitz.com', verify=False)
self.assertRaises(requests.exceptions.SSLError, s.get, 'https://kennethreitz.com')
s.get('https://kennethreitz.com', verify=False)
if __name__ == '__main__':