diff -r 3ecddf168f1f Lib/cmd.py
--- a/Lib/cmd.py	Tue Nov 29 00:53:09 2011 +0100
+++ b/Lib/cmd.py	Tue Nov 29 06:53:40 2011 -0800
@@ -208,7 +208,10 @@
             return self.emptyline()
         if cmd is None:
             return self.default(line)
-        self.lastcmd = line
+        if line in ('EOF', ):
+            self.lastcmd = ''
+        else:
+            self.lastcmd = line
         if cmd == '':
             return self.default(line)
         else: