diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-12-31 21:40:42 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-12-31 21:40:42 -0600 |
| commit | 1f7df8f2070391f28391e3594580c07e11b6b32b (patch) | |
| tree | ec03dfe4f71df3840232731145b8f6736fc6a314 /Lib/socket.py | |
| parent | b25d611f8d9140e83acbfffb6b0579939c88c033 (diff) | |
| parent | 10e93a6d40502e100c68090730e0b3190df97854 (diff) | |
| download | cpython-git-1f7df8f2070391f28391e3594580c07e11b6b32b.tar.gz | |
merge heads
Diffstat (limited to 'Lib/socket.py')
| -rw-r--r-- | Lib/socket.py | 4 |
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): |