Index: Lib/cgi.py
===================================================================
--- Lib/cgi.py	(revision 63467)
+++ Lib/cgi.py	(working copy)
@@ -36,7 +36,7 @@
 import os
 import urllib
 import mimetools
-import rfc822
+import email
 import collections
 from io import StringIO
 
@@ -404,7 +404,7 @@
 
     disposition_options: dictionary of corresponding options
 
-    headers: a dictionary(-like) object (sometimes rfc822.Message or a
+    headers: a dictionary(-like) object (sometimes email.message.Message or a
         subclass thereof) containing *all* headers
 
     The class is subclassable, mostly for the purpose of overriding
@@ -637,7 +637,7 @@
                      environ, keep_blank_values, strict_parsing)
         # Throw first part away
         while not part.done:
-            headers = rfc822.Message(self.fp)
+            headers = email.message_from_file(self.fp)
             part = klass(self.fp, headers, ib,
                          environ, keep_blank_values, strict_parsing)
             self.list.append(part)