Merge 3.5

This commit is contained in:
Victor Stinner 2017-01-12 11:53:09 +01:00
commit 12c4aba1a0
2 changed files with 19 additions and 8 deletions

View file

@ -477,7 +477,7 @@ class NewIMAPTests(NewIMAPTestsMixin, unittest.TestCase):
@unittest.skipUnless(ssl, "SSL not available")
class NewIMAPSSLTests(NewIMAPTestsMixin, unittest.TestCase):
imap_class = imaplib.IMAP4_SSL
imap_class = IMAP4_SSL
server_class = SecureTCPServer
def test_ssl_raises(self):