python#27522: break unintended cycle in feedparser.

bitdancer · bitdancer · commit 702b0460d20f · 2016-07-15T21:29:13.000-04:00
Patch by Costas.
diff --git a/Lib/email/feedparser.py b/Lib/email/feedparser.py
@@ -145,7 +145,7 @@ def __init__(self, _factory=None, *, policy=compat32):
 
         """
         self.policy = policy
-        self._factory_kwds = lambda: {'policy': self.policy}
+        self._old_style_factory = False
         if _factory is None:
             # What this should be:
             #self._factory = policy.default_message_factory
@@ -160,7 +160,7 @@ def __init__(self, _factory=None, *, policy=compat32):
                 _factory(policy=self.policy)
             except TypeError:
                 # Assume this is an old-style factory
-                self._factory_kwds = lambda: {}
+                self._old_style_factory = True
         self._input = BufferedSubFile()
         self._msgstack = []
         self._parse = self._parsegen().__next__
@@ -197,7 +197,10 @@ def close(self):
         return root
 
     def _new_message(self):
-        msg = self._factory(**self._factory_kwds())
+        if self._old_style_factory:
+            msg = self._factory()
+        else:
+            msg = self._factory(policy=self.policy)
         if self._cur and self._cur.get_content_type() == 'multipart/digest':
             msg.set_default_type('message/rfc822')
         if self._msgstack:
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -24,6 +24,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #27522: Avoid an unintentional reference cycle in email.feedparser.
+
 - Issue #26844: Fix error message for imp.find_module() to refer to 'path'
   instead of 'name'. Patch by Lev Maximov.
 
