From: Zackery Spytz <zspytz@gmail.com>
Date: Wed, 11 Sep 2019 13:22:08 +0000 (-0600)
Subject: closes bpo-36711: Remove duplicate method in Lib/email/feedparser.py. (GH-14801)
X-Git-Tag: v2.7.17rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b239ab9107cd5bcbfbfa3b46290191298718ced3;p=thirdparty%2FPython%2Fcpython.git

closes bpo-36711: Remove duplicate method in Lib/email/feedparser.py. (GH-14801)
---

diff --git a/Lib/email/feedparser.py b/Lib/email/feedparser.py
index 8031ca666eef..298fe79df8d9 100644
--- a/Lib/email/feedparser.py
+++ b/Lib/email/feedparser.py
@@ -117,26 +117,6 @@ class BufferedSubFile(object):
             self._partial = [parts.pop()]
         self.pushlines(parts)
 
-    def pushlines(self, lines):
-        # Crack into lines, but preserve the newlines on the end of each
-        parts = NLCRE_crack.split(data)
-        # The *ahem* interesting behaviour of re.split when supplied grouping
-        # parentheses is that the last element of the resulting list is the
-        # data after the final RE.  In the case of a NL/CR terminated string,
-        # this is the empty string.
-        self._partial = parts.pop()
-        #GAN 29Mar09  bugs 1555570, 1721862  Confusion at 8K boundary ending with \r:
-        # is there a \n to follow later?
-        if not self._partial and parts and parts[-1].endswith('\r'):
-            self._partial = parts.pop(-2)+parts.pop()
-        # parts is a list of strings, alternating between the line contents
-        # and the eol character(s).  Gather up a list of lines after
-        # re-attaching the newlines.
-        lines = []
-        for i in range(len(parts) // 2):
-            lines.append(parts[i*2] + parts[i*2+1])
-        self.pushlines(lines)
-
     def pushlines(self, lines):
         # Reverse and insert at the front of the lines.
         self._lines[:0] = lines[::-1]