diff options
| author | Martin Panter <vadmium> | 2015-09-09 06:27:43 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium> | 2015-09-09 06:27:43 (GMT) |
| commit | 6088b7bd492aed4524a34156a1ecfd5facc17faa (patch) | |
| tree | d831fee7798b5397ee742663b7c98f3bb3573ffe /Lib | |
| parent | 52ee2471b3e0a62db47e36f7f8fe7a2c24ac1ff9 (diff) | |
| parent | 9499413508b7ff4e7806f8f8e59ba9176d98b39c (diff) | |
| download | cpython-6088b7bd492aed4524a34156a1ecfd5facc17faa.zip cpython-6088b7bd492aed4524a34156a1ecfd5facc17faa.tar.gz cpython-6088b7bd492aed4524a34156a1ecfd5facc17faa.tar.bz2 | |
Merge 3.4 into 3.5
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_os.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index f675259..0b77835 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -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 |