diff options
| author | Martin Panter <vadmium> | 2015-09-09 06:28:08 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium> | 2015-09-09 06:28:08 (GMT) |
| commit | 3f560c16e54aae0a1873a551e097e6e41e6aed54 (patch) | |
| tree | 321af9620f256f996a10c2c80f9d00c997284261 /Lib/test/test_os.py | |
| parent | 29bdbd0270b64b6625be2c94240d2b0a233f8ea5 (diff) | |
| parent | 6088b7bd492aed4524a34156a1ecfd5facc17faa (diff) | |
| download | cpython-3f560c16e54aae0a1873a551e097e6e41e6aed54.zip cpython-3f560c16e54aae0a1873a551e097e6e41e6aed54.tar.gz cpython-3f560c16e54aae0a1873a551e097e6e41e6aed54.tar.bz2 | |
Merge 3.5 into 3.6
Diffstat (limited to 'Lib/test/test_os.py')
| -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 15040c3..c424b57 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -2331,7 +2331,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 |