From 1f4560c872f56e0d416dd091e9dbccbb93f716ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Fran=C3=A7ois=20Natali?= <neologix@free.fr>
Date: Tue, 24 May 2011 23:47:49 +0200
Subject: [PATCH] Issue #1441530: In imaplib, read the data in one chunk to
 speed up large reads and simplify code.

---
 Lib/imaplib.py | 10 +---------
 Misc/NEWS      |  3 +++
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index 142e27bc87b..1b540655f28 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -249,15 +249,7 @@ class IMAP4:
 
     def read(self, size):
         """Read 'size' bytes from remote."""
-        chunks = []
-        read = 0
-        while read < size:
-            data = self.file.read(min(size-read, 4096))
-            if not data:
-                break
-            read += len(data)
-            chunks.append(data)
-        return b''.join(chunks)
+        return self.file.read(size)
 
 
     def readline(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index 917dfe3ab39..68130a92ee1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -161,6 +161,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #1441530: In imaplib, read the data in one chunk to speed up large
+  reads and simplify code.
+
 - Issue #12070: Fix the Makefile parser of the sysconfig module to handle
   correctly references to "bogus variable" (e.g. "prefix=$/opt/python").