Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 17e3d69

Browse files
birkenfeldbirkenfeld
committed
Avoid triggering DeprecationWarnings in test_smtpd and smtpd.
1 parent ca9400f commit 17e3d69

2 files changed

Lines changed: 31 additions & 30 deletions

File tree

‎Lib/smtpd.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,10 @@ def found_terminator(self):
293293
else:
294294
data.append(text)
295295
self.received_data = NEWLINE.join(data)
296-
status = self.__server.process_message(self.peer,
297-
self.mailfrom,
298-
self.rcpttos,
299-
self.received_data)
296+
status = self.smtp_server.process_message(self.peer,
297+
self.mailfrom,
298+
self.rcpttos,
299+
self.received_data)
300300
self.rcpttos = []
301301
self.mailfrom = None
302302
self.smtp_state = self.COMMAND

‎Lib/test/test_smtpd.py‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -79,109 +79,110 @@ def test_server_accept(self):
7979

8080
def test_missing_data(self):
8181
self.write_line(b'')
82-
self.assertEqual(self.channel.last,
82+
self.assertEqual(self.channel.socket.last,
8383
b'500 Error: bad syntax\r\n')
8484

8585
def test_EHLO_not_implemented(self):
8686
self.write_line(b'EHLO test.example')
87-
self.assertEqual(self.channel.last,
87+
self.assertEqual(self.channel.socket.last,
8888
b'502 Error: command "EHLO" not implemented\r\n')
8989

9090
def test_HELO(self):
9191
name = socket.getfqdn()
9292
self.write_line(b'HELO test.example')
93-
self.assertEqual(self.channel.last,
93+
self.assertEqual(self.channel.socket.last,
9494
'250 {}\r\n'.format(name).encode('ascii'))
9595

9696
def test_HELO_bad_syntax(self):
9797
self.write_line(b'HELO')
98-
self.assertEqual(self.channel.last,
98+
self.assertEqual(self.channel.socket.last,
9999
b'501 Syntax: HELO hostname\r\n')
100100

101101
def test_HELO_duplicate(self):
102102
self.write_line(b'HELO test.example')
103103
self.write_line(b'HELO test.example')
104-
self.assertEqual(self.channel.last,
104+
self.assertEqual(self.channel.socket.last,
105105
b'503 Duplicate HELO/EHLO\r\n')
106106

107107
def test_NOOP(self):
108108
self.write_line(b'NOOP')
109-
self.assertEqual(self.channel.last, b'250 Ok\r\n')
109+
self.assertEqual(self.channel.socket.last, b'250 Ok\r\n')
110110

111111
def test_NOOP_bad_syntax(self):
112112
self.write_line(b'NOOP hi')
113-
self.assertEqual(self.channel.last,
113+
self.assertEqual(self.channel.socket.last,
114114
b'501 Syntax: NOOP\r\n')
115115

116116
def test_QUIT(self):
117117
self.write_line(b'QUIT')
118-
self.assertEqual(self.channel.last, b'221 Bye\r\n')
118+
self.assertEqual(self.channel.socket.last, b'221 Bye\r\n')
119119

120120
def test_QUIT_arg_ignored(self):
121121
self.write_line(b'QUIT bye bye')
122-
self.assertEqual(self.channel.last, b'221 Bye\r\n')
122+
self.assertEqual(self.channel.socket.last, b'221 Bye\r\n')
123123

124124
def test_bad_state(self):
125-
self.channel._SMTPChannel__state = 'BAD STATE'
125+
self.channel.smtp_state = 'BAD STATE'
126126
self.write_line(b'HELO')
127-
self.assertEqual(self.channel.last, b'451 Internal confusion\r\n')
127+
self.assertEqual(self.channel.socket.last,
128+
b'451 Internal confusion\r\n')
128129

129130
def test_need_MAIL(self):
130131
self.write_line(b'RCPT to:spam@example')
131-
self.assertEqual(self.channel.last,
132+
self.assertEqual(self.channel.socket.last,
132133
b'503 Error: need MAIL command\r\n')
133134

134135
def test_MAIL_syntax(self):
135136
self.write_line(b'MAIL from eggs@example')
136-
self.assertEqual(self.channel.last,
137+
self.assertEqual(self.channel.socket.last,
137138
b'501 Syntax: MAIL FROM:<address>\r\n')
138139

139140
def test_MAIL_missing_from(self):
140141
self.write_line(b'MAIL from:')
141-
self.assertEqual(self.channel.last,
142+
self.assertEqual(self.channel.socket.last,
142143
b'501 Syntax: MAIL FROM:<address>\r\n')
143144

144145
def test_MAIL_chevrons(self):
145146
self.write_line(b'MAIL from:<eggs@example>')
146-
self.assertEqual(self.channel.last, b'250 Ok\r\n')
147+
self.assertEqual(self.channel.socket.last, b'250 Ok\r\n')
147148

148149
def test_nested_MAIL(self):
149150
self.write_line(b'MAIL from:eggs@example')
150151
self.write_line(b'MAIL from:spam@example')
151-
self.assertEqual(self.channel.last,
152+
self.assertEqual(self.channel.socket.last,
152153
b'503 Error: nested MAIL command\r\n')
153154

154155
def test_need_RCPT(self):
155156
self.write_line(b'MAIL From:eggs@example')
156157
self.write_line(b'DATA')
157-
self.assertEqual(self.channel.last,
158+
self.assertEqual(self.channel.socket.last,
158159
b'503 Error: need RCPT command\r\n')
159160

160161
def test_RCPT_syntax(self):
161162
self.write_line(b'MAIL From:eggs@example')
162163
self.write_line(b'RCPT to eggs@example')
163-
self.assertEqual(self.channel.last,
164+
self.assertEqual(self.channel.socket.last,
164165
b'501 Syntax: RCPT TO: <address>\r\n')
165166

166167
def test_data_dialog(self):
167168
self.write_line(b'MAIL From:eggs@example')
168-
self.assertEqual(self.channel.last, b'250 Ok\r\n')
169+
self.assertEqual(self.channel.socket.last, b'250 Ok\r\n')
169170
self.write_line(b'RCPT To:spam@example')
170-
self.assertEqual(self.channel.last, b'250 Ok\r\n')
171+
self.assertEqual(self.channel.socket.last, b'250 Ok\r\n')
171172

172173
self.write_line(b'DATA')
173-
self.assertEqual(self.channel.last,
174+
self.assertEqual(self.channel.socket.last,
174175
b'354 End data with <CR><LF>.<CR><LF>\r\n')
175176
self.write_line(b'data\r\nmore\r\n.')
176-
self.assertEqual(self.channel.last, b'250 Ok\r\n')
177+
self.assertEqual(self.channel.socket.last, b'250 Ok\r\n')
177178
self.assertEqual(self.server.messages[-1],
178179
('peer', 'eggs@example', ['spam@example'], 'data\nmore'))
179180

180181
def test_DATA_syntax(self):
181182
self.write_line(b'MAIL From:eggs@example')
182183
self.write_line(b'RCPT To:spam@example')
183184
self.write_line(b'DATA spam')
184-
self.assertEqual(self.channel.last, b'501 Syntax: DATA\r\n')
185+
self.assertEqual(self.channel.socket.last, b'501 Syntax: DATA\r\n')
185186

186187
def test_multiple_RCPT(self):
187188
self.write_line(b'MAIL From:eggs@example')
@@ -197,13 +198,13 @@ def test_manual_status(self):
197198
self.write_line(b'RCPT To:spam@example')
198199
self.write_line(b'DATA')
199200
self.write_line(b'return status\r\n.')
200-
self.assertEqual(self.channel.last, b'250 Okish\r\n')
201+
self.assertEqual(self.channel.socket.last, b'250 Okish\r\n')
201202

202203
def test_RSET(self):
203204
self.write_line(b'MAIL From:eggs@example')
204205
self.write_line(b'RCPT To:spam@example')
205206
self.write_line(b'RSET')
206-
self.assertEqual(self.channel.last, b'250 Ok\r\n')
207+
self.assertEqual(self.channel.socket.last, b'250 Ok\r\n')
207208
self.write_line(b'MAIL From:foo@example')
208209
self.write_line(b'RCPT To:eggs@example')
209210
self.write_line(b'DATA')
@@ -213,7 +214,7 @@ def test_RSET(self):
213214

214215
def test_RSET_syntax(self):
215216
self.write_line(b'RSET hi')
216-
self.assertEqual(self.channel.last, b'501 Syntax: RSET\r\n')
217+
self.assertEqual(self.channel.socket.last, b'501 Syntax: RSET\r\n')
217218

218219

219220
def test_main():

0 commit comments

Comments
 (0)