Here is a patch to fix the two defects in Lib/email/feedparser.py. I also made some extra changes to the tests:

* Remove some tests from Lib/test/test_email/test_email.py, because I think they were redundant with methods of the same name in test_defect_handling.py.

* Change a couple of the tests in test_defect_handling.py to verify there are no defects recorded at all even in raise_on_defect=True mode.