Index: Lib/test/test_poplib.py
===================================================================
--- Lib/test/test_poplib.py	(revision 74312)
+++ Lib/test/test_poplib.py	(working copy)
@@ -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,7 +104,10 @@
     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):
 
     handler = DummyPOP3Handler
@@ -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
Index: Lib/poplib.py
===================================================================
--- Lib/poplib.py	(revision 74312)
+++ Lib/poplib.py	(working copy)
@@ -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')