diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2011-02-07 17:50:39 +0000 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2011-02-07 17:50:39 +0000 |
| commit | 077bbe48e384806a8b15d0b2cbf318448eb2e9ee (patch) | |
| tree | 2211e72c2be6278fac6e68a36ac3112310b1ad8f | |
| parent | 9dc24aa136570b8fa067c48b36ed035eb8a11908 (diff) | |
| download | pysendfile-077bbe48e384806a8b15d0b2cbf318448eb2e9ee.tar.gz | |
fix py3 tests on BSD
| -rw-r--r-- | sendfilemodule.c | 2 | ||||
| -rw-r--r-- | test_sendfile.py | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/sendfilemodule.c b/sendfilemodule.c index 7726fff..724e3c5 100644 --- a/sendfilemodule.c +++ b/sendfilemodule.c @@ -362,7 +362,7 @@ PyInit_sendfile(void) #else #define INITERROR return -void init_sendfile(void) +void initsendfile(void) #endif { #if PY_MAJOR_VERSION >= 3 diff --git a/test_sendfile.py b/test_sendfile.py index ab12bc9..e3b8f84 100644 --- a/test_sendfile.py +++ b/test_sendfile.py @@ -222,8 +222,9 @@ class TestSendfile(unittest.TestCase): def test_headers(self): total_sent = 0 + headers = _bytes("x") * 512 sent, offset = sendfile.sendfile(self.sockno, self.fileno, 0, 4096, - headers=("x" * 512)) + headers=[headers]) total_sent += sent offset = 4096 nbytes = 4096 @@ -233,7 +234,7 @@ class TestSendfile(unittest.TestCase): break total_sent += sent - expected_data = "x" * 512 + DATA + expected_data = headers + DATA self.assertEqual(total_sent, len(expected_data)) self.client.close() self.server.wait() @@ -242,8 +243,9 @@ class TestSendfile(unittest.TestCase): def test_trailers(self): total_sent = 0 + trailers = _bytes("x") * 512 sent, offset = sendfile.sendfile(self.sockno, self.fileno, 0, 4096, - trailers=("x" * 512)) + trailers=[trailers]) total_sent += sent offset = 4096 nbytes = 4096 @@ -253,7 +255,7 @@ class TestSendfile(unittest.TestCase): break total_sent += sent - expected_data = DATA[:4096] + "x" * 512 + expected_data = DATA[:4096] + trailers expected_data += DATA[4096:] self.assertEqual(total_sent, len(expected_data)) self.client.close() |