Index: fixes/fix_imports.py
===================================================================
--- fixes/fix_imports.py	(revision 57339)
+++ fixes/fix_imports.py	(working copy)
@@ -11,9 +11,12 @@
 from fixes import basefix
 from fixes.util import Name, attr_chain, any, set
 
-MAPPING = {"StringIO":  ("io", ["StringIO"]),
-           "cStringIO": ("io", ["StringIO"]),
-           "md5":       ("hashlib", ["md5"])}
+MAPPING = {"StringIO":      ("io", ["StringIO"]),
+           "cStringIO":     ("io", ["StringIO"]),
+           "md5":           ("hashlib", ["md5"])
+           "HTMLParser":    ("html_parser",
+                             ["HTMLParseError", "HTMLParser"]),
+           }
 
 
 def alternates(members):
