mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge 3.4 into 3.5

Browse source
This commit is contained in:
Martin Panter 2015-09-09 06:27:43 +00:00
commit 6088b7bd49
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_os.py
View file

@ -2332,7 +2332,7 @@ class TestSendfile(unittest.TestCase):
**{'in': self.fileno})
if self.SUPPORT_HEADERS_TRAILERS:
os.sendfile(self.sockno, self.fileno, offset=0, count=4096,
headers=None, trailers=None, flags=0)
headers=(), trailers=(), flags=0)
# --- headers / trailers tests