Merge branch 'master' into windows-wheels

4 files changed, 13 insertions, 5 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1e14bde..c99ec69 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.8.0
+-----
+
+* Drop support for Python 3.5.
+
 1.7.0
 -----
 
diff --git a/jq.pyx b/jq.pyx
index 0f580c4..f42efdf 100644
--- a/jq.pyx
+++ b/jq.pyx
@@ -3,6 +3,7 @@ import json
 import threading
 
 from cpython.bytes cimport PyBytes_AsString
+from cpython.bytes cimport PyBytes_AsStringAndSize
 from libc.float cimport DBL_MAX
 from libc.math cimport INFINITY, modf
 
@@ -335,8 +336,10 @@ cdef class _ResultIterator(object):
         self._slurp = slurp
         self._ready = False
         cdef jv_parser* parser = jv_parser_new(0)
-        cdef char* cbytes_input = PyBytes_AsString(bytes_input)
-        jv_parser_set_buf(parser, cbytes_input, len(bytes_input), 0)
+        cdef char* cbytes_input
+        cdef ssize_t clen_input
+        PyBytes_AsStringAndSize(bytes_input, &cbytes_input, &clen_input)
+        jv_parser_set_buf(parser, cbytes_input, clen_input, 0)
         self._parser = parser
 
     def __iter__(self):
diff --git a/setup.py b/setup.py
index f442f0e..c10630f 100644
--- a/setup.py
+++ b/setup.py
@@ -99,7 +99,7 @@ setup(
     long_description=_read("README.rst"),
     author='Michael Williamson',
     url='https://github.com/mwilliamson/jq.py',
-    python_requires='>=3.5',
+    python_requires='>=3.6',
     license='BSD 2-Clause',
     ext_modules = [jq_extension],
     cmdclass={"build_ext": jq_build_ext},
@@ -109,13 +109,13 @@ setup(
         'License :: OSI Approved :: BSD License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
     ],
 )
 
diff --git a/tox.ini b/tox.ini
index 60226cf..2fb2492 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py36,py37,py38,py39,py310,py311,pypy3
+envlist = py36,py37,py38,py39,py310,py311,py312,pypy3
 isolated_build = True
 [testenv]
 changedir = {envtmpdir}