Jason Mastaler's patch to break the dependence on rfc822.py for the

address parsing routines. Closes SF patch #613434.

Author: warsaw

Lib/email/Utils.py

@@ -13,13 +13,13 @@
 fromcStringIOimportStringIO
 fromtypesimportListType
 
-fromrfc822importquote
-fromrfc822importAddressListas_AddressList
-fromrfc822importmktime_tz
+fromemail._parseaddrimportquote
+fromemail._parseaddrimportAddressListas_AddressList
+fromemail._parseaddrimportmktime_tz
 
 # We need wormarounds for bugs in these methods in older Pythons (see below)
-fromrfc822importparsedateas_parsedate
-fromrfc822importparsedate_tzas_parsedate_tz
+fromemail._parseaddrimportparsedateas_parsedate
+fromemail._parseaddrimportparsedate_tzas_parsedate_tz
 
 try:
 True, False