Autoformat py files using Black (#105)
* Autoformat all py files using Black
* Fix lint errors
* Fix indentation errors (https://travis-ci.org/httplib2/httplib2/jobs/408136309)
* Refactor three test cases and exclude them on on Travis py27/pypy
diff --git a/python2/ssl_protocol_test.py b/python2/ssl_protocol_test.py
index bac84c0..fedf7cf 100755
--- a/python2/ssl_protocol_test.py
+++ b/python2/ssl_protocol_test.py
@@ -8,50 +8,56 @@
class TestSslProtocol(unittest.TestCase):
+ def testSslCertValidationWithInvalidCaCert(self):
+ if sys.version_info >= (2, 6):
+ http = httplib2.Http(ca_certs="/nosuchfile")
+ if sys.version_info >= (2, 7):
+ with self.assertRaises(IOError):
+ http.request("https://www.google.com/", "GET")
+ else:
+ self.assertRaises(
+ ssl.SSLError, http.request, "https://www.google.com/", "GET"
+ )
- def testSslCertValidationWithInvalidCaCert(self):
- if sys.version_info >= (2, 6):
- http = httplib2.Http(ca_certs='/nosuchfile')
- if sys.version_info >= (2, 7):
- with self.assertRaises(IOError):
- http.request('https://www.google.com/', 'GET')
- else:
- self.assertRaises(
- ssl.SSLError, http.request, 'https://www.google.com/', 'GET')
+ def testSslCertValidationWithSelfSignedCaCert(self):
+ if sys.version_info >= (2, 7):
+ other_ca_certs = os.path.join(
+ os.path.dirname(os.path.abspath(httplib2.__file__)),
+ "test",
+ "other_cacerts.txt",
+ )
+ http = httplib2.Http(ca_certs=other_ca_certs)
+ if sys.platform != "darwin":
+ with self.assertRaises(httplib2.SSLHandshakeError):
+ http.request("https://www.google.com/", "GET")
- def testSslCertValidationWithSelfSignedCaCert(self):
- if sys.version_info >= (2, 7):
- other_ca_certs = os.path.join(
- os.path.dirname(os.path.abspath(httplib2.__file__ )), 'test',
- 'other_cacerts.txt')
- http = httplib2.Http(ca_certs=other_ca_certs)
- if sys.platform != 'darwin':
- with self.assertRaises(httplib2.SSLHandshakeError):
- http.request('https://www.google.com/', 'GET')
+ def testSslProtocolTlsV1AndShouldPass(self):
+ http = httplib2.Http(ssl_version=ssl.PROTOCOL_TLSv1)
+ urls = [
+ "https://www.amazon.com",
+ "https://www.apple.com",
+ "https://www.twitter.com",
+ ]
+ for url in urls:
+ if sys.version_info >= (2, 7):
+ self.assertIsNotNone(http.request(uri=url))
- def testSslProtocolTlsV1AndShouldPass(self):
- http = httplib2.Http(ssl_version=ssl.PROTOCOL_TLSv1)
- urls = ['https://www.amazon.com',
- 'https://www.apple.com',
- 'https://www.twitter.com']
- for url in urls:
- if sys.version_info >= (2, 7):
- self.assertIsNotNone(http.request(uri=url))
-
- def testSslProtocolV3AndShouldFailDueToPoodle(self):
- http = httplib2.Http(ssl_version=ssl.PROTOCOL_SSLv3)
- urls = ['https://www.amazon.com',
- 'https://www.apple.com',
- 'https://www.twitter.com']
- for url in urls:
- if sys.version_info >= (2, 7):
- with self.assertRaises(httplib2.SSLHandshakeError):
- http.request(url)
- try:
- http.request(url)
- except httplib2.SSLHandshakeError as e:
- self.assertTrue('sslv3 alert handshake failure' in str(e))
+ def testSslProtocolV3AndShouldFailDueToPoodle(self):
+ http = httplib2.Http(ssl_version=ssl.PROTOCOL_SSLv3)
+ urls = [
+ "https://www.amazon.com",
+ "https://www.apple.com",
+ "https://www.twitter.com",
+ ]
+ for url in urls:
+ if sys.version_info >= (2, 7):
+ with self.assertRaises(httplib2.SSLHandshakeError):
+ http.request(url)
+ try:
+ http.request(url)
+ except httplib2.SSLHandshakeError as e:
+ self.assertTrue("sslv3 alert handshake failure" in str(e))
-if __name__ == '__main__':
- unittest.main()
+if __name__ == "__main__":
+ unittest.main()