json-stream 2.3.2__tar.gz → 2.3.3__tar.gz

{json-stream-2.3.2/src/json_stream.egg-info → json_stream-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: json-stream
-Version: 2.3.2
+Version: 2.3.3
 Summary: Streaming JSON encoder and decoder
 Author-email: Jamie Cockburn <jamie_cockburn@hotmail.co.uk>
 License: Copyright (c) 2020 Jamie Cockburn
@@ -33,16 +33,20 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: <4,>=3.5
 Description-Content-Type: text/markdown
+License-File: LICENSE.txt
+Requires-Dist: json-stream-rs-tokenizer>=0.4.17
 Provides-Extra: requests
+Requires-Dist: requests; extra == "requests"
 Provides-Extra: httpx
-License-File: LICENSE.txt
+Requires-Dist: httpx; extra == "httpx"
 
 # json-stream
 

{json-stream-2.3.2 → json_stream-2.3.3}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "json-stream"
-version = "2.3.2"
+version = "2.3.3"
 authors = [
     {name = "Jamie Cockburn", email="jamie_cockburn@hotmail.co.uk"},
 ]
@@ -18,11 +18,12 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
     "License :: OSI Approved :: MIT License",
     "Programming Language :: Python :: 3 :: Only",
-    "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",
+    "Programming Language :: Python :: 3.13",
 ]
 requires-python = ">=3.5,<4"
 dependencies = ["json-stream-rs-tokenizer >= 0.4.17"]

{json-stream-2.3.2 → json_stream-2.3.3}/src/json_stream/base.py

@@ -3,7 +3,7 @@ import copy
 from abc import ABC
 from collections import OrderedDict
 from itertools import chain
-from typing import Optional, Iterator, Any
+from typing import Optional, Iterator, Any, Mapping, Sequence
 
 from json_stream.tokenizer import TokenType
 
@@ -159,6 +159,7 @@ class StreamingJSONList(StreamingJSONBase, ABC):
         return self._iter_items()
 
 
+@Sequence.register
 class PersistentStreamingJSONList(PersistentStreamingJSONBase, StreamingJSONList):
     def _init_persistent_data(self):
         return []
@@ -184,6 +185,7 @@ class PersistentStreamingJSONList(PersistentStreamingJSONBase, StreamingJSONList
         return self._find_item(k)
 
 
+@Sequence.register
 class TransientStreamingJSONList(TransientStreamingJSONBase, StreamingJSONList):
     def __init__(self, token_stream):
         super().__init__(token_stream)
@@ -250,6 +252,7 @@ class StreamingJSONObject(StreamingJSONBase, ABC):
             return default
 
 
+@Mapping.register
 class PersistentStreamingJSONObject(PersistentStreamingJSONBase, StreamingJSONObject):
     def _init_persistent_data(self):
         return OrderedDict()
@@ -276,6 +279,7 @@ class PersistentStreamingJSONObject(PersistentStreamingJSONBase, StreamingJSONOb
         return self._find_item(k)
 
 
+@Mapping.register
 class TransientStreamingJSONObject(TransientStreamingJSONBase, StreamingJSONObject):
     def _find_item(self, k):
         was_started = self._started

{json-stream-2.3.2 → json_stream-2.3.3}/src/json_stream/tests/test_buffering.py

@@ -1,20 +1,11 @@
 from unittest import TestCase
 
-from json_stream_rs_tokenizer import rust_tokenizer_or_raise
-
 import json_stream
 from json_stream import to_standard_types
-from json_stream.tokenizer import tokenize
 
 
 class TestBuffering(TestCase):
-    def test_buffering(self):
-        self._test_buffering(tokenizer=rust_tokenizer_or_raise())
-
-    def test_buffering_python_tokenizer(self):
-        self._test_buffering(tokenizer=tokenize)
-
-    def _test_buffering(self, tokenizer):
+    def test_no_buffering(self):
         happenings = []
 
         def data_in_chunks(data, chunk_size=15):
@@ -24,7 +15,7 @@ class TestBuffering(TestCase):
                 yield part
 
         json_string = b'{"tasks":[{"id":1,"title":"task1"},{"id":2,"title":"task2"},{"id":3,"title":"task3"}]}'
-        stream = json_stream.load(data_in_chunks(json_string), tokenizer=tokenizer)
+        stream = json_stream.load(data_in_chunks(json_string))
 
         for task in stream["tasks"]:
             happenings.append(('item', to_standard_types(task)))

json_stream-2.3.3/src/json_stream/tests/test_collection_abcs.py

@@ -0,0 +1,17 @@
+from typing import Mapping, Sequence
+
+from json_stream.select_tokenizer import default_tokenizer
+from json_stream.tests import JSONLoadTestCase
+
+
+class TestCollectionABCs(JSONLoadTestCase):
+
+    def test_isinstance_sequence(self):
+        for persistent in (True, False):
+            with self.subTest(persistent=persistent):
+                self.assertIsInstance(self._to_data([], persistent,  False, default_tokenizer), Sequence)
+
+    def test_isinstance_mapping(self):
+        for persistent in (True, False):
+            with self.subTest(persistent=persistent):
+                self.assertIsInstance(self._to_data({}, persistent,  False, default_tokenizer), Mapping)

{json-stream-2.3.2 → json_stream-2.3.3}/src/json_stream/tests/test_tokenizer_integration.py

@@ -4,24 +4,12 @@ from unittest import skipUnless
 import json_stream_rs_tokenizer
 
 from json_stream import load
-from json_stream.tokenizer import tokenize
 
 from json_stream.select_tokenizer import default_tokenizer
 
 from json_stream.tests import JSONLoadTestCase
 
 
-class TestPythonTokenizer(JSONLoadTestCase):
-    def test_load_object(self):
-        obj = {"a": 1, "b": None, "c": True}
-        self._test_object(obj, persistent=False, tokenizer=tokenize)
-
-    def test_load_object_binary(self):
-        self.assertIs(default_tokenizer, json_stream_rs_tokenizer.RustTokenizer)
-        obj = {"a": 1, "b": None, "c": True}
-        self._test_object(obj, persistent=False, binary=True, tokenizer=tokenize)
-
-
 @skipUnless(hasattr(json_stream_rs_tokenizer, 'RustTokenizer'), 'rust tokenizer not available')
 class TestRSTokenizer(JSONLoadTestCase):
     def test_load_object(self):

{json-stream-2.3.2 → json_stream-2.3.3}/src/json_stream/tests/test_writer.py

@@ -5,19 +5,19 @@ from unittest import TestCase
 from json_stream.writer import streamable_dict, streamable_list
 
 
-class TestWriter(TestCase):
+class BaseTestWriter:
+    def dump(self, o):
+        raise NotImplementedError()
+
     def test_writer_wrapper(self):
         def dict_content(n):
             yield "a  list", streamable_list(range(4))
 
         o = streamable_dict(dict_content(5))
-
-        buffer = StringIO()
-        json.dump(o, buffer)
-        self.assertEqual('{"a  list": [0, 1, 2, 3]}', buffer.getvalue())
+        result = self.dump(o)
+        self.assertEqual('{"a  list": [0, 1, 2, 3]}', result)
 
     def test_writer_decorator(self):
-
         @streamable_list
         def list_content(n):
             return range(n)
@@ -28,19 +28,27 @@ class TestWriter(TestCase):
 
         o = dict_content(5)
 
-        buffer = StringIO()
-        json.dump(o, buffer)
-        self.assertEqual('{"a  list": [0, 1, 2, 3, 4]}', buffer.getvalue())
+        result = self.dump(o)
+        self.assertEqual('{"a  list": [0, 1, 2, 3, 4]}', result)
 
     def test_writer_empty(self):
-
         @streamable_list
         def empty_list():
             for i in range(0):  # never yields
                 yield i
 
         o = empty_list()
+        result = self.dump(o)
+        self.assertEqual('[]', result)
+
 
+class TestWriterDump(BaseTestWriter, TestCase):
+    def dump(self, o):
         buffer = StringIO()
         json.dump(o, buffer)
-        self.assertEqual('[]', buffer.getvalue())
+        return buffer.getvalue()
+
+
+class TestWriterDumps(BaseTestWriter, TestCase):
+    def dump(self, o):
+        return json.dumps(o)

{json-stream-2.3.2 → json_stream-2.3.3}/src/json_stream/writer.py

@@ -1,10 +1,11 @@
+import typing
 from collections import deque
 from functools import wraps
 
 
 class Streamable:
-    def __init__(self, iterable):
-        super().__init__()
+    def __init__(self, iterable, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self._it = iter(iterable)
         self._cache = deque()
 
@@ -48,6 +49,9 @@ class StreamableDict(Streamable, dict):
         for lists, except items are provided by passed in
         generator. Generator must produce pairs of key/value
     """
+    def __init__(self, iterable):
+        super().__init__(iterable, {'__error__': 'json-stream error'})
+
     def items(self):
         return self
 

{json-stream-2.3.2 → json_stream-2.3.3/src/json_stream.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: json-stream
-Version: 2.3.2
+Version: 2.3.3
 Summary: Streaming JSON encoder and decoder
 Author-email: Jamie Cockburn <jamie_cockburn@hotmail.co.uk>
 License: Copyright (c) 2020 Jamie Cockburn
@@ -33,16 +33,20 @@ Classifier: Intended Audience :: Developers
 Classifier: Topic :: Software Development :: Libraries
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Python: <4,>=3.5
 Description-Content-Type: text/markdown
+License-File: LICENSE.txt
+Requires-Dist: json-stream-rs-tokenizer>=0.4.17
 Provides-Extra: requests
+Requires-Dist: requests; extra == "requests"
 Provides-Extra: httpx
-License-File: LICENSE.txt
+Requires-Dist: httpx; extra == "httpx"
 
 # json-stream
 

{json-stream-2.3.2 → json_stream-2.3.3}/src/json_stream.egg-info/SOURCES.txt

@@ -27,6 +27,7 @@ src/json_stream/requests/tests/__init__.py
 src/json_stream/requests/tests/test_requests.py
 src/json_stream/tests/__init__.py
 src/json_stream/tests/test_buffering.py
+src/json_stream/tests/test_collection_abcs.py
 src/json_stream/tests/test_iterators.py
 src/json_stream/tests/test_loader.py
 src/json_stream/tests/test_tokenizer.py