cpython: 7f50e1836ddb (original) (raw)

Mercurial > cpython

changeset 90509:7f50e1836ddb

Fix failure in test_poplib after issue #20951. [#20951]

Antoine Pitrou solipsis@pitrou.net
date	Tue, 29 Apr 2014 10:27:09 +0200
parents	2a1d63f09560
children	a627b3e3c9c8
files	Lib/test/test_poplib.py
diffstat	1 files changed, 5 insertions(+), 10 deletions(-)[+] [-] Lib/test/test_poplib.py 15

line wrap: on

line diff

--- a/Lib/test/test_poplib.py +++ b/Lib/test/test_poplib.py @@ -349,23 +349,18 @@ class TestPOP3Class(TestCase): if SUPPORTS_SSL:

from test.test_ftplib import SSLConnection

class DummyPOP3_SSLHandler(DummyPOP3Handler):

class DummyPOP3_SSLHandler(SSLConnection, DummyPOP3Handler):

def init(self, conn): asynchat.async_chat.init(self, conn)

       ssl_socket = ssl.wrap_socket(self.socket, certfile=CERTFILE,[](#l1.14)

                                     server_side=True,[](#l1.15)

                                     do_handshake_on_connect=False)[](#l1.16)

```
       self.del_channel()[](#l1.17)
```

       self.set_socket(ssl_socket)[](#l1.18)

       # Must try handshake before calling push()[](#l1.19)

```
       self.tls_active = True[](#l1.20)
```

       self.tls_starting = True[](#l1.21)

       self._do_tls_handshake()[](#l1.22)

       self.secure_connection()[](#l1.23)
       self.set_terminator(b"\r\n")[](#l1.24)
       self.in_buffer = [][](#l1.25)
       self.push('+OK dummy pop3 server ready. <timestamp>')[](#l1.26)

```
       self.tls_active = True[](#l1.27)
```

       self.tls_starting = False[](#l1.28)

@requires_ssl