From e8ff16123582eb9d5c321f5c7e652335abfba368 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Sat, 23 May 2020 13:28:13 +0100 Subject: [PATCH] Fix PY_SSIZE_T_CLEAN python warning --- .travis.yml | 2 +- modules/modpython.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c5809d07..65dea99f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -135,7 +135,7 @@ script: - env LLVM_PROFILE_FILE="$PWD/unittest.profraw" make VERBOSE=1 unittest - sudo make install # TODO: use DEVEL_COVER_OPTIONS for https://metacpan.org/pod/Devel::Cover - - env LLVM_PROFILE_FILE="$PWD/inttest.profraw" ZNC_MODPERL_COVERAGE_OPTS="-db,$PWD/cover_db" make VERBOSE=1 inttest + - env LLVM_PROFILE_FILE="$PWD/inttest.profraw" ZNC_MODPERL_COVERAGE_OPTS="-db,$PWD/cover_db" PYTHONWARNINGS=error make VERBOSE=1 inttest - /usr/local/bin/znc --version after_success: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ~/perl5/bin/cover --no-gcov --report=clover; fi diff --git a/modules/modpython.cpp b/modules/modpython.cpp index dfe53b5b..7bc76fc5 100644 --- a/modules/modpython.cpp +++ b/modules/modpython.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#define PY_SSIZE_T_CLEAN #include #include @@ -455,7 +456,7 @@ CBSOCK(ConnectionRefused); void CPySocket::ReadData(const char* data, size_t len) { PyObject* pyRes = PyObject_CallMethod(m_pyObj, const_cast("OnReadData"), - const_cast("y#"), data, (int)len); + const_cast("y#"), data, (Py_ssize_t)len); CHECKCLEARSOCK("OnReadData"); }