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')