summaryrefslogtreecommitdiffstats
path: root/Lib/imaplib.py
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2013-03-19 17:56:54 (GMT)
committerR David Murray <rdmurray@bitdance.com>2013-03-19 17:56:54 (GMT)
commit660e89b163b52de6fbcdb4b0d963b2baf4da1d9d (patch)
treee75f8002c52874b5195a078169ffa492b3c83dec /Lib/imaplib.py
parented1fe6be061d3c0be9d8b7735b65bd17db07850c (diff)
parent7889944b83cf04cefb45cd658644298218eac5db (diff)
downloadcpython-660e89b163b52de6fbcdb4b0d963b2baf4da1d9d.zip
cpython-660e89b163b52de6fbcdb4b0d963b2baf4da1d9d.tar.gz
cpython-660e89b163b52de6fbcdb4b0d963b2baf4da1d9d.tar.bz2
Merge: #17443: Fix buffering in IMAP4_stream.
In Python2 Popen uses *FILE objects, which wind up buffering even though subprocess defaults to no buffering. In Python3, subprocess streams really are unbuffered by default, but the imaplib code assumes read is buffered. This patch uses the default buffer size from the io module to get buffered streams from Popen. Much debugging work and patch by Diane Trout. The imap protocol is too complicated to write a test for this simple change with our current level of test infrastructure.
Diffstat (limited to 'Lib/imaplib.py')
-rw-r--r--Lib/imaplib.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index cc23e89..c959f12 100644
--- a/Lib/imaplib.py
+++ b/Lib/imaplib.py
@@ -24,6 +24,8 @@ __version__ = "2.58"
import binascii, errno, random, re, socket, subprocess, sys, time, calendar
from datetime import datetime, timezone, timedelta
+from io import DEFAULT_BUFFER_SIZE
+
try:
import ssl
HAVE_SSL = True
@@ -1244,6 +1246,7 @@ class IMAP4_stream(IMAP4):
self.sock = None
self.file = None
self.process = subprocess.Popen(self.command,
+ bufsize=DEFAULT_BUFFER_SIZE,
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
shell=True, close_fds=True)
self.writefile = self.process.stdin