#20476: add a message_factory policy attribute to email.
diff --git a/Lib/email/feedparser.py b/Lib/email/feedparser.py
index 2fa77d7..3d74978 100644
--- a/Lib/email/feedparser.py
+++ b/Lib/email/feedparser.py
@@ -24,7 +24,6 @@
import re
from email import errors
-from email import message
from email._policybase import compat32
from collections import deque
from io import StringIO
@@ -148,13 +147,7 @@
self.policy = policy
self._old_style_factory = False
if _factory is None:
- # What this should be:
- #self._factory = policy.default_message_factory
- # but, because we are post 3.4 feature freeze, fix with temp hack:
- if self.policy is compat32:
- self._factory = message.Message
- else:
- self._factory = message.EmailMessage
+ self._factory = policy.message_factory
else:
self._factory = _factory
try: