merge from 3.4

orsenthil · orsenthil · commit f6f61ff339c8 · 2014-06-03T07:25:40.000-07:00
Fix issue #21641: Close the socket before raising the SMTPResponseException. Fixes the ResourceWarning in the test run. Patch by Claudiu.Popa.
diff --git a/Lib/smtplib.py b/Lib/smtplib.py
@@ -377,6 +377,7 @@ def getreply(self):
             if self.debuglevel > 0:
                 print('reply:', repr(line), file=stderr)
             if len(line) > _MAXLINE:
+                self.close()
                 raise SMTPResponseException(500, "Line too long.")
             resp.append(line[4:].strip(b' \t\r\n'))
             code = line[:3]
