From 17e3d698b512025d525c1ecb6b0531b575ad5518 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 31 Jul 2010 10:08:09 +0000 Subject: Avoid triggering DeprecationWarnings in test_smtpd and smtpd. --- Lib/smtpd.py | 8 ++++---- Lib/test/test_smtpd.py | 53 +++++++++++++++++++++++++------------------------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/Lib/smtpd.py b/Lib/smtpd.py index dd83988..ca68790 100755 --- a/Lib/smtpd.py +++ b/Lib/smtpd.py @@ -293,10 +293,10 @@ class SMTPChannel(asynchat.async_chat): else: data.append(text) self.received_data = NEWLINE.join(data) - status = self.__server.process_message(self.peer, - self.mailfrom, - self.rcpttos, - self.received_data) + status = self.smtp_server.process_message(self.peer, + self.mailfrom, + self.rcpttos, + self.received_data) self.rcpttos = [] self.mailfrom = None self.smtp_state = self.COMMAND diff --git a/Lib/test/test_smtpd.py b/Lib/test/test_smtpd.py index 538525b..2b781bd 100644 --- a/Lib/test/test_smtpd.py +++ b/Lib/test/test_smtpd.py @@ -79,101 +79,102 @@ class SMTPDChannelTest(TestCase): def test_missing_data(self): self.write_line(b'') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'500 Error: bad syntax\r\n') def test_EHLO_not_implemented(self): self.write_line(b'EHLO test.example') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'502 Error: command "EHLO" not implemented\r\n') def test_HELO(self): name = socket.getfqdn() self.write_line(b'HELO test.example') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, '250 {}\r\n'.format(name).encode('ascii')) def test_HELO_bad_syntax(self): self.write_line(b'HELO') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'501 Syntax: HELO hostname\r\n') def test_HELO_duplicate(self): self.write_line(b'HELO test.example') self.write_line(b'HELO test.example') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'503 Duplicate HELO/EHLO\r\n') def test_NOOP(self): self.write_line(b'NOOP') - self.assertEqual(self.channel.last, b'250 Ok\r\n') + self.assertEqual(self.channel.socket.last, b'250 Ok\r\n') def test_NOOP_bad_syntax(self): self.write_line(b'NOOP hi') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'501 Syntax: NOOP\r\n') def test_QUIT(self): self.write_line(b'QUIT') - self.assertEqual(self.channel.last, b'221 Bye\r\n') + self.assertEqual(self.channel.socket.last, b'221 Bye\r\n') def test_QUIT_arg_ignored(self): self.write_line(b'QUIT bye bye') - self.assertEqual(self.channel.last, b'221 Bye\r\n') + self.assertEqual(self.channel.socket.last, b'221 Bye\r\n') def test_bad_state(self): - self.channel._SMTPChannel__state = 'BAD STATE' + self.channel.smtp_state = 'BAD STATE' self.write_line(b'HELO') - self.assertEqual(self.channel.last, b'451 Internal confusion\r\n') + self.assertEqual(self.channel.socket.last, + b'451 Internal confusion\r\n') def test_need_MAIL(self): self.write_line(b'RCPT to:spam@example') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'503 Error: need MAIL command\r\n') def test_MAIL_syntax(self): self.write_line(b'MAIL from eggs@example') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'501 Syntax: MAIL FROM:
\r\n') def test_MAIL_missing_from(self): self.write_line(b'MAIL from:') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'501 Syntax: MAIL FROM:
\r\n') def test_MAIL_chevrons(self): self.write_line(b'MAIL from:') - self.assertEqual(self.channel.last, b'250 Ok\r\n') + self.assertEqual(self.channel.socket.last, b'250 Ok\r\n') def test_nested_MAIL(self): self.write_line(b'MAIL from:eggs@example') self.write_line(b'MAIL from:spam@example') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'503 Error: nested MAIL command\r\n') def test_need_RCPT(self): self.write_line(b'MAIL From:eggs@example') self.write_line(b'DATA') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'503 Error: need RCPT command\r\n') def test_RCPT_syntax(self): self.write_line(b'MAIL From:eggs@example') self.write_line(b'RCPT to eggs@example') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'501 Syntax: RCPT TO:
\r\n') def test_data_dialog(self): self.write_line(b'MAIL From:eggs@example') - self.assertEqual(self.channel.last, b'250 Ok\r\n') + self.assertEqual(self.channel.socket.last, b'250 Ok\r\n') self.write_line(b'RCPT To:spam@example') - self.assertEqual(self.channel.last, b'250 Ok\r\n') + self.assertEqual(self.channel.socket.last, b'250 Ok\r\n') self.write_line(b'DATA') - self.assertEqual(self.channel.last, + self.assertEqual(self.channel.socket.last, b'354 End data with .\r\n') self.write_line(b'data\r\nmore\r\n.') - self.assertEqual(self.channel.last, b'250 Ok\r\n') + self.assertEqual(self.channel.socket.last, b'250 Ok\r\n') self.assertEqual(self.server.messages[-1], ('peer', 'eggs@example', ['spam@example'], 'data\nmore')) @@ -181,7 +182,7 @@ class SMTPDChannelTest(TestCase): self.write_line(b'MAIL From:eggs@example') self.write_line(b'RCPT To:spam@example') self.write_line(b'DATA spam') - self.assertEqual(self.channel.last, b'501 Syntax: DATA\r\n') + self.assertEqual(self.channel.socket.last, b'501 Syntax: DATA\r\n') def test_multiple_RCPT(self): self.write_line(b'MAIL From:eggs@example') @@ -197,13 +198,13 @@ class SMTPDChannelTest(TestCase): self.write_line(b'RCPT To:spam@example') self.write_line(b'DATA') self.write_line(b'return status\r\n.') - self.assertEqual(self.channel.last, b'250 Okish\r\n') + self.assertEqual(self.channel.socket.last, b'250 Okish\r\n') def test_RSET(self): self.write_line(b'MAIL From:eggs@example') self.write_line(b'RCPT To:spam@example') self.write_line(b'RSET') - self.assertEqual(self.channel.last, b'250 Ok\r\n') + self.assertEqual(self.channel.socket.last, b'250 Ok\r\n') self.write_line(b'MAIL From:foo@example') self.write_line(b'RCPT To:eggs@example') self.write_line(b'DATA') @@ -213,7 +214,7 @@ class SMTPDChannelTest(TestCase): def test_RSET_syntax(self): self.write_line(b'RSET hi') - self.assertEqual(self.channel.last, b'501 Syntax: RSET\r\n') + self.assertEqual(self.channel.socket.last, b'501 Syntax: RSET\r\n') def test_main(): -- cgit v0.12