summaryrefslogtreecommitdiff
path: root/Lib/socket.py
diff options
context:
space:
mode:
authorKristján Valur Jónsson <kristjan@ccpgames.com>2012-12-25 13:04:50 +0000
committerKristján Valur Jónsson <kristjan@ccpgames.com>2012-12-25 13:04:50 +0000
commit2380feeff8e574690831d2eb778ca52d3af09b8a (patch)
tree4e753854f2cfb21f132cdc57d8d6310f638335fc /Lib/socket.py
parent513e9b4f610cc4b1edd7d6890d65b05aaba41188 (diff)
downloadcpython-git-2380feeff8e574690831d2eb778ca52d3af09b8a.tar.gz
issue #879399
Fix line buffering of socket._fileobject
Diffstat (limited to 'Lib/socket.py')
-rw-r--r--Lib/socket.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/socket.py b/Lib/socket.py
index bd364e70db..aac04f6ca7 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -319,8 +319,8 @@ class _fileobject(object):
self._wbuf.append(data)
self._wbuf_len += len(data)
if (self._wbufsize == 0 or
- self._wbufsize == 1 and '\n' in data or
- self._wbuf_len >= self._wbufsize):
+ (self._wbufsize == 1 and '\n' in data) or
+ (self._wbufsize > 1 and self._wbuf_len >= self._wbufsize)):
self.flush()
def writelines(self, list):