Merged revisions 74330 via svnmerge from
svn+ssh://pythondev@www.python.org/python/branches/py3k
........
r74330 | mark.dickinson | 2009-08-06 17:06:25 +0100 (Thu, 06 Aug 2009) | 3 lines
Issue #6622: Fix 'variable referenced before assignment' bug in POP3.apop.
Thanks Vincent Legoll.
........
diff --git a/Lib/poplib.py b/Lib/poplib.py
index 770819e..1a529d0 100644
--- a/Lib/poplib.py
+++ b/Lib/poplib.py
@@ -282,7 +282,7 @@
NB: mailbox is locked by server from here to 'quit()'
"""
- secret = bytes(secret, self.encoding)
+ secret = bytes(password, self.encoding)
m = self.timestamp.match(self.welcome)
if not m:
raise error_proto('-ERR APOP not supported by server')
diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py
index ad00802..1807bca 100644
--- a/Lib/test/test_poplib.py
+++ b/Lib/test/test_poplib.py
@@ -36,7 +36,7 @@
asynchat.async_chat.__init__(self, conn)
self.set_terminator(b"\r\n")
self.in_buffer = []
- self.push('+OK dummy pop3 server ready.')
+ self.push('+OK dummy pop3 server ready. <timestamp>')
def collect_incoming_data(self, data):
self.in_buffer.append(data)
@@ -104,6 +104,9 @@
def cmd_rpop(self, arg):
self.push('+OK done nothing.')
+ def cmd_apop(self, arg):
+ self.push('+OK done nothing.')
+
class DummyPOP3Server(asyncore.dispatcher, threading.Thread):
@@ -169,7 +172,8 @@
self.server.stop()
def test_getwelcome(self):
- self.assertEqual(self.client.getwelcome(), b'+OK dummy pop3 server ready.')
+ self.assertEqual(self.client.getwelcome(),
+ b'+OK dummy pop3 server ready. <timestamp>')
def test_exceptions(self):
self.assertRaises(poplib.error_proto, self.client._shortcmd, 'echo -err')
@@ -209,6 +213,9 @@
def test_rpop(self):
self.assertOK(self.client.rpop('foo'))
+ def test_apop(self):
+ self.assertOK(self.client.apop('foo', 'dummypassword'))
+
def test_top(self):
expected = (b'+OK 116 bytes',
[b'From: postmaster@python.org', b'Content-Type: text/plain',
@@ -239,7 +246,7 @@
self.set_socket(ssl_socket)
self.set_terminator(b"\r\n")
self.in_buffer = []
- self.push('+OK dummy pop3 server ready.')
+ self.push('+OK dummy pop3 server ready. <timestamp>')
class TestPOP3_SSLClass(TestPOP3Class):
# repeat previous tests by using poplib.POP3_SSL
diff --git a/Misc/NEWS b/Misc/NEWS
index f7c1302..0de8ad5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -42,6 +42,9 @@
Library
-------
+- Issue #6622: Fix "local variable 'secret' referenced before
+ assignment" bug in POP3.apop.
+
- Issue #6637: defaultdict.copy() did not work when the default factory
was left unspecified. Also, the eval/repr round-trip would fail when
the default_factory was None.