python-rapidjson 1.19__tar.gz → 1.20__tar.gz

{python-rapidjson-1.19 → python_rapidjson-1.20}/CHANGES.rst

@@ -1,6 +1,20 @@
 Changes
 -------
 
+1.20 (2024-08-05)
+~~~~~~~~~~~~~~~~~
+
+* Rectify type hints if ``loads()`` and ``Decoder.__call__()`` (`issue #214`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/issues/214
+
+* Ensure ``Validator`` receives valid UTF-8 ``bytes``/``bytearray`` arguments
+
+* Generate wheels on PyPI using Python 3.13.0rc1 release, thanks to cibuildwheel `2.20.0`__
+
+  __ https://cibuildwheel.pypa.io/en/stable/changelog/#v2200
+
+
 1.19 (2024-07-28)
 ~~~~~~~~~~~~~~~~~
 

{python-rapidjson-1.19 → python_rapidjson-1.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-rapidjson
-Version: 1.19
+Version: 1.20
 Summary: Python wrapper around rapidjson
 Home-page: https://github.com/python-rapidjson/python-rapidjson
 Author: Ken Robbins
@@ -155,6 +155,20 @@ __ https://python-rapidjson.readthedocs.io/en/latest/quickstart.html#incompatibi
 Changes
 -------
 
+1.20 (2024-08-05)
+~~~~~~~~~~~~~~~~~
+
+* Rectify type hints if ``loads()`` and ``Decoder.__call__()`` (`issue #214`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/issues/214
+
+* Ensure ``Validator`` receives valid UTF-8 ``bytes``/``bytearray`` arguments
+
+* Generate wheels on PyPI using Python 3.13.0rc1 release, thanks to cibuildwheel `2.20.0`__
+
+  __ https://cibuildwheel.pypa.io/en/stable/changelog/#v2200
+
+
 1.19 (2024-07-28)
 ~~~~~~~~~~~~~~~~~
 

{python-rapidjson-1.19 → python_rapidjson-1.20}/docs/changes.rst

@@ -1,6 +1,20 @@
 Changes
 -------
 
+1.20 (2024-08-05)
+~~~~~~~~~~~~~~~~~
+
+* Rectify type hints if ``loads()`` and ``Decoder.__call__()`` (`issue #214`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/issues/214
+
+* Ensure ``Validator`` receives valid UTF-8 ``bytes``/``bytearray`` arguments
+
+* Generate wheels on PyPI using Python 3.13.0rc1 release, thanks to cibuildwheel `2.20.0`__
+
+  __ https://cibuildwheel.pypa.io/en/stable/changelog/#v2200
+
+
 1.19 (2024-07-28)
 ~~~~~~~~~~~~~~~~~
 

{python-rapidjson-1.19 → python_rapidjson-1.20}/docs/validator.rst

@@ -2,7 +2,7 @@
 .. :Project:   python-rapidjson -- Validator class documentation
 .. :Author:    Lele Gaifax <lele@metapensiero.it>
 .. :License:   MIT License
-.. :Copyright: © 2017, 2018, 2019, 2020 Lele Gaifax
+.. :Copyright: © 2017, 2018, 2019, 2020, 2024 Lele Gaifax
 ..
 
 =================
@@ -18,7 +18,7 @@
 .. class:: Validator(json_schema)
 
    :param json_schema: the `JSON schema`__, specified as a ``str`` instance or an *UTF-8*
-                       ``bytes`` instance
+                       :class:`bytes`/:class:`bytearray` instance
    :raises JSONDecodeError: if `json_schema` is not a valid ``JSON`` value
 
    __ http://json-schema.org/documentation.html
@@ -26,7 +26,7 @@
    .. method:: __call__(json)
 
       :param json: the ``JSON`` value, specified as a ``str`` instance or an *UTF-8*
-                   ``bytes`` instance, that will be validated
+                   :class:`bytes`/:class:`bytearray` instance, that will be validated
       :raises JSONDecodeError: if `json` is not a valid ``JSON`` value
 
       The given `json` value will be validated accordingly to the *schema*: a

{python-rapidjson-1.19 → python_rapidjson-1.20}/python_rapidjson.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-rapidjson
-Version: 1.19
+Version: 1.20
 Summary: Python wrapper around rapidjson
 Home-page: https://github.com/python-rapidjson/python-rapidjson
 Author: Ken Robbins
@@ -155,6 +155,20 @@ __ https://python-rapidjson.readthedocs.io/en/latest/quickstart.html#incompatibi
 Changes
 -------
 
+1.20 (2024-08-05)
+~~~~~~~~~~~~~~~~~
+
+* Rectify type hints if ``loads()`` and ``Decoder.__call__()`` (`issue #214`__)
+
+  __ https://github.com/python-rapidjson/python-rapidjson/issues/214
+
+* Ensure ``Validator`` receives valid UTF-8 ``bytes``/``bytearray`` arguments
+
+* Generate wheels on PyPI using Python 3.13.0rc1 release, thanks to cibuildwheel `2.20.0`__
+
+  __ https://cibuildwheel.pypa.io/en/stable/changelog/#v2200
+
+
 1.19 (2024-07-28)
 ~~~~~~~~~~~~~~~~~
 

{python-rapidjson-1.19 → python_rapidjson-1.20}/rapidjson.cpp

@@ -2156,8 +2156,9 @@ decoder_call(PyObject* self, PyObject* args, PyObject* kwargs)
         jsonStr = NULL;
         jsonStrLen = 0;
     } else {
-        PyErr_SetString(PyExc_TypeError,
-                        "Expected string or UTF-8 encoded bytes or bytearray");
+        PyErr_SetString(
+            PyExc_TypeError,
+            "Expected string or UTF-8 encoded bytes or bytearray or a file-like object");
         return NULL;
     }
 
@@ -3725,17 +3726,24 @@ static PyObject* validator_call(PyObject* self, PyObject* args, PyObject* kwargs
         return NULL;
 
     const char* jsonStr;
+    PyObject* asUnicode = NULL;
 
-    if (PyBytes_Check(jsonObject)) {
-        jsonStr = PyBytes_AsString(jsonObject);
-        if (jsonStr == NULL)
-            return NULL;
-    } else if (PyUnicode_Check(jsonObject)) {
+    if (PyUnicode_Check(jsonObject)) {
         jsonStr = PyUnicode_AsUTF8(jsonObject);
         if (jsonStr == NULL)
             return NULL;
+    } else if (PyBytes_Check(jsonObject) || PyByteArray_Check(jsonObject)) {
+        asUnicode = PyUnicode_FromEncodedObject(jsonObject, "utf-8", NULL);
+        if (asUnicode == NULL)
+            return NULL;
+        jsonStr = PyUnicode_AsUTF8(asUnicode);
+        if (jsonStr == NULL) {
+            Py_DECREF(asUnicode);
+            return NULL;
+        }
     } else {
-        PyErr_SetString(PyExc_TypeError, "Expected string or UTF-8 encoded bytes");
+        PyErr_SetString(PyExc_TypeError,
+                        "Expected string or UTF-8 encoded bytes or bytearray");
         return NULL;
     }
 
@@ -3747,6 +3755,8 @@ static PyObject* validator_call(PyObject* self, PyObject* args, PyObject* kwargs
     Py_END_ALLOW_THREADS
 
     if (error) {
+        if (asUnicode != NULL)
+            Py_DECREF(asUnicode);
         PyErr_SetString(decode_error, "Invalid JSON");
         return NULL;
     }
@@ -3758,6 +3768,9 @@ static PyObject* validator_call(PyObject* self, PyObject* args, PyObject* kwargs
     accept = d.Accept(validator);
     Py_END_ALLOW_THREADS
 
+    if (asUnicode != NULL)
+        Py_DECREF(asUnicode);
+
     if (!accept) {
         StringBuffer sptr;
         StringBuffer dptr;
@@ -3771,7 +3784,9 @@ static PyObject* validator_call(PyObject* self, PyObject* args, PyObject* kwargs
                                         sptr.GetString(), dptr.GetString());
         PyErr_SetObject(validation_error, error);
 
-        Py_XDECREF(error);
+        if (error != NULL)
+            Py_DECREF(error);
+
         sptr.Clear();
         dptr.Clear();
 
@@ -3798,17 +3813,24 @@ static PyObject* validator_new(PyTypeObject* type, PyObject* args, PyObject* kwa
         return NULL;
 
     const char* jsonStr;
+    PyObject* asUnicode = NULL;
 
-    if (PyBytes_Check(jsonObject)) {
-        jsonStr = PyBytes_AsString(jsonObject);
-        if (jsonStr == NULL)
-            return NULL;
-    } else if (PyUnicode_Check(jsonObject)) {
+    if (PyUnicode_Check(jsonObject)) {
         jsonStr = PyUnicode_AsUTF8(jsonObject);
         if (jsonStr == NULL)
             return NULL;
+    } else if (PyBytes_Check(jsonObject) || PyByteArray_Check(jsonObject)) {
+        asUnicode = PyUnicode_FromEncodedObject(jsonObject, "utf-8", NULL);
+        if (asUnicode == NULL)
+            return NULL;
+        jsonStr = PyUnicode_AsUTF8(asUnicode);
+        if (jsonStr == NULL) {
+            Py_DECREF(asUnicode);
+            return NULL;
+        }
     } else {
-        PyErr_SetString(PyExc_TypeError, "Expected string or UTF-8 encoded bytes");
+        PyErr_SetString(PyExc_TypeError,
+                        "Expected string or UTF-8 encoded bytes or bytearray");
         return NULL;
     }
 
@@ -3819,6 +3841,9 @@ static PyObject* validator_new(PyTypeObject* type, PyObject* args, PyObject* kwa
     error = d.Parse(jsonStr).HasParseError();
     Py_END_ALLOW_THREADS
 
+    if (asUnicode != NULL)
+        Py_DECREF(asUnicode);
+
     if (error) {
         PyErr_SetString(decode_error, "Invalid JSON");
         return NULL;

{python-rapidjson-1.19 → python_rapidjson-1.20}/tests/test_base_types.py

@@ -3,7 +3,7 @@
 # :Author:    John Anderson <sontek@gmail.com>
 # :License:   MIT License
 # :Copyright: © 2015 John Anderson
-# :Copyright: © 2016, 2017, 2018, 2019, 2020, 2021 Lele Gaifax
+# :Copyright: © 2016, 2017, 2018, 2019, 2020, 2021, 2024 Lele Gaifax
 #
 
 import random
@@ -182,6 +182,19 @@ def test_decode_error(loads):
     pytest.raises(rj.JSONDecodeError, loads, '{')
 
 
+def test_decode_bytes_and_bytearray():
+    s = 'FòBàr'
+    j = f'"{s}"'
+    utf32 = j.encode('utf-32')
+    for loader in (rj.loads, rj.Decoder()):
+        pytest.raises(UnicodeDecodeError, loader, utf32)
+
+    utf8 = j.encode('utf-8')
+    for loader in (rj.loads, rj.Decoder()):
+        for data in (utf8, bytearray(utf8)):
+            assert loader(data) == s
+
+
 def test_shared_keys(loads):
     res = loads('[{"key": "value1"}, {"key": "value2"}]')
     key1, = res[0].keys()

{python-rapidjson-1.19 → python_rapidjson-1.20}/tests/test_validator.py

@@ -2,7 +2,7 @@
 # :Project:   python-rapidjson -- Validator class tests
 # :Author:    Lele Gaifax <lele@metapensiero.it>
 # :License:   MIT License
-# :Copyright: © 2017, 2019, 2020 Lele Gaifax
+# :Copyright: © 2017, 2019, 2020, 2024 Lele Gaifax
 #
 
 import pytest
@@ -26,8 +26,10 @@ def test_invalid_json():
     ('{ "type": ["number", "string"] }', '"Life, the universe, and everything"'),
 ))
 def test_valid(schema, json):
-    validate = rj.Validator(schema)
-    validate(json)
+    for s in (schema, schema.encode('utf-8'), bytearray(schema.encode('utf-8'))):
+        for j in (json, json.encode('utf-8'), bytearray(json.encode('utf-8'))):
+            validate = rj.Validator(s)
+            validate(j)
 
 
 @pytest.mark.parametrize('schema,json,details', (

{python-rapidjson-1.19 → python_rapidjson-1.20}/typings/rapidjson/__init__.pyi

@@ -148,7 +148,7 @@ def load(
     allow_nan: t.Optional[bool] = True,
 ) -> t.Any: ...
 def loads(
-    string: str,
+    string: t.Union[str, bytes, bytearray],
     *,
     object_hook: t.Optional[t.Callable[[t.Dict[str, t.Any]], t.Any]] = None,
     number_mode: t.Optional[_NumberMode] = NM_NAN,
@@ -179,7 +179,7 @@ class Decoder:
     ) -> None: ...
     def __call__(
         self,
-        json: t.Union[str, bytes, t.IO],
+        json: t.Union[str, bytes, bytearray, t.IO],
         chunk_size: t.Optional[int] = 65536,
     ) -> t.Any: ...
 
@@ -228,5 +228,5 @@ class RawJSON:
 
 @t.final
 class Validator:
-    def __init__(self, json_schema: t.Union[str, bytes]) -> None: ...
-    def __call__(self, json: t.Union[str, bytes]) -> None: ...
+    def __init__(self, json_schema: t.Union[str, bytes, bytearray]) -> None: ...
+    def __call__(self, json: t.Union[str, bytes, bytearray]) -> None: ...

python_rapidjson-1.20/version.txt

@@ -0,0 +1 @@
+1.20

python-rapidjson-1.19/version.txt

@@ -1 +0,0 @@
-1.19