json-stream 2.5.0__tar.gz → 2.5.2__tar.gz

{json_stream-2.5.0/src/json_stream.egg-info → json_stream-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json-stream
-Version: 2.5.0
+Version: 2.5.2
 Summary: Streaming JSON encoder and decoder
 Author-email: Jamie Cockburn <jamie_cockburn@hotmail.co.uk>
 License: Copyright (c) 2020 Jamie Cockburn

{json_stream-2.5.0 → json_stream-2.5.2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "json-stream"
-version = "2.5.0"
+version = "2.5.2"
 authors = [
     {name = "Jamie Cockburn", email="jamie_cockburn@hotmail.co.uk"},
 ]

{json_stream-2.5.0 → json_stream-2.5.2}/src/json_stream/base.py

@@ -81,10 +81,10 @@ class StreamingJSONBase(ABC):
         raise NotImplementedError()  # pragma: no cover
 
     def __copy__(self):
-        raise copy.Error("Copying json_steam objects leads to a bad time")
+        raise copy.Error("Copying json_stream objects leads to a bad time")
 
     def __deepcopy__(self, memo):
-        raise copy.Error("Copying json_steam objects leads to a bad time")
+        raise copy.Error("Copying json_stream objects leads to a bad time")
 
 
 class PersistentStreamingJSONBase(StreamingJSONBase, ABC):

{json_stream-2.5.0 → json_stream-2.5.2}/src/json_stream/loader.py

@@ -4,7 +4,10 @@ from json_stream.select_tokenizer import default_tokenizer
 
 
 def load(fp_or_iterable, persistent=False, tokenizer=default_tokenizer, **tokenizer_kwargs):
-    return next(load_many(fp_or_iterable, persistent, tokenizer, **tokenizer_kwargs))
+    try:
+        return next(load_many(fp_or_iterable, persistent, tokenizer, **tokenizer_kwargs))
+    except StopIteration:
+        raise ValueError('No JSON value found') from None
 
 
 def load_many(fp_or_iterable, persistent=False, tokenizer=default_tokenizer, **tokenizer_kwargs):

{json_stream-2.5.0 → json_stream-2.5.2}/src/json_stream/tests/test_load_many.py

@@ -7,6 +7,18 @@ from json_stream import to_standard_types
 
 
 class TestLoadMany(TestCase):
+    def test_load_many_without_json_value(self):
+        for persistent in (False, True):
+            for text in ('', ' \t\r\n'):
+                sources = [
+                    StringIO(text), BytesIO(text.encode()),
+                    [text], [text.encode()],
+                    list(text), [char.encode() for char in text],
+                ]
+                for source in sources:
+                    with self.subTest(persistent=persistent, text=text, source=source):
+                        self.assertEqual(list(json_stream.load_many(source, persistent=persistent)), [])
+
     def test_load_many(self):
         # NDJSON-like: one JSON value per line
         payload = "\n".join([

{json_stream-2.5.0 → json_stream-2.5.2}/src/json_stream/tests/test_loader.py

@@ -1,6 +1,6 @@
 import copy
 import json
-from io import StringIO
+from io import BytesIO, StringIO
 
 from json_stream import load
 from json_stream.base import (
@@ -14,6 +14,19 @@ from json_stream.tests import JSONLoadTestCase
 
 
 class TestLoader(JSONLoadTestCase):
+    def test_load_without_json_value(self):
+        for persistent in (False, True):
+            for text in ('', ' \t\r\n'):
+                sources = [
+                    StringIO(text), BytesIO(text.encode()),
+                    [text], [text.encode()],
+                    list(text), [char.encode() for char in text],
+                ]
+                for source in sources:
+                    with self.subTest(persistent=persistent, text=text, source=source):
+                        with self.assertRaisesRegex(ValueError, 'No JSON value found'):
+                            load(source, persistent=persistent)
+
     def test_load_empty_object(self):
         obj = {}
         self._test_object(obj, persistent=True)
@@ -177,9 +190,9 @@ class TestLoader(JSONLoadTestCase):
 
     def test_not_copiable(self):
         json_str = '[["a"], "b", "c"]'
-        with self.assertRaisesRegex(copy.Error, "^Copying json_steam objects leads to a bad time$"):
+        with self.assertRaisesRegex(copy.Error, "^Copying json_stream objects leads to a bad time$"):
             copy.copy(load(StringIO(json_str)))
-        with self.assertRaisesRegex(copy.Error, "^Copying json_steam objects leads to a bad time$"):
+        with self.assertRaisesRegex(copy.Error, "^Copying json_stream objects leads to a bad time$"):
             copy.deepcopy(load(StringIO(json_str)))
 
     def test_transient_to_persistent(self):
@@ -218,6 +231,7 @@ class TestLoader(JSONLoadTestCase):
 
     def test_primitives(self):
         primitives = (
+            ("null", None),
             ("true", True),
             ("false", False),
             ("123", 123),

{json_stream-2.5.0 → json_stream-2.5.2}/src/json_stream/tests/test_tokenizer.py

@@ -5,6 +5,7 @@ https://github.com/danielyule/naya
 
 Copyright (c) 2019 Daniel Yule
 """
+import math
 import re
 from io import StringIO
 from unittest import TestCase
@@ -59,6 +60,33 @@ class TestJsonTokenization(TestCase):
         self.assertRaises(ValueError, self.tokenize_sequence, "3.6ea")
         self.assertRaises(ValueError, self.tokenize_sequence, "67.8e+a")
 
+    def test_nan_infinity_parsing(self):
+        token_list = self.tokenize_sequence("NaN")
+        self.assertEqual(1, len(token_list))
+        ttype, token = token_list[0]
+        self.assertTrue(math.isnan(token))
+        self.assertEqual(ttype, TokenType.NUMBER)
+
+        self.assertNumberEquals(float("inf"), "Infinity")
+        self.assertNumberEquals(float("-inf"), "-Infinity")
+
+        self.assertRaises(ValueError, self.tokenize_sequence, "Na")
+        self.assertRaises(ValueError, self.tokenize_sequence, "Nax")
+        self.assertRaises(ValueError, self.tokenize_sequence, "In")
+        self.assertRaises(ValueError, self.tokenize_sequence, "Inf")
+        self.assertRaises(ValueError, self.tokenize_sequence, "Infi")
+        self.assertRaises(ValueError, self.tokenize_sequence, "Infin")
+        self.assertRaises(ValueError, self.tokenize_sequence, "Infini")
+        self.assertRaises(ValueError, self.tokenize_sequence, "Infinit")
+        self.assertRaises(ValueError, self.tokenize_sequence, "Infinityx")
+        self.assertRaises(ValueError, self.tokenize_sequence, "-In")
+        self.assertRaises(ValueError, self.tokenize_sequence, "-Inf")
+        self.assertRaises(ValueError, self.tokenize_sequence, "-Infi")
+        self.assertRaises(ValueError, self.tokenize_sequence, "-Infin")
+        self.assertRaises(ValueError, self.tokenize_sequence, "-Infini")
+        self.assertRaises(ValueError, self.tokenize_sequence, "-Infinit")
+        self.assertRaises(ValueError, self.tokenize_sequence, "-Infinityx")
+
     def test_operator_parsing(self):
         self.assertOperatorEquals("{", "{")
         self.assertOperatorEquals("}", "}")

{json_stream-2.5.0 → json_stream-2.5.2}/src/json_stream/tests/test_visitor.py

@@ -22,6 +22,28 @@ class TestVisitor(TestCase):
         json_stream.visit(StringIO("1"), lambda a, b: visited.append((a, b)))
         self.assertListEqual([(1, ())], visited)
 
+    def test_visitor_without_json_value(self):
+        for text in ('', ' \t\r\n'):
+            sources = [
+                StringIO(text), BytesIO(text.encode()),
+                [text], [text.encode()],
+                list(text), [char.encode() for char in text],
+            ]
+            for source in sources:
+                with self.subTest(text=text, source=source):
+                    visited = []
+                    with self.assertRaisesRegex(ValueError, 'No JSON value found'):
+                        json_stream.visit(source, lambda a, b: visited.append((a, b)))
+                    self.assertListEqual([], visited)
+
+    def test_visit_many_without_json_value(self):
+        for text in ('', ' \t\r\n'):
+            for source in (StringIO(text), BytesIO(text.encode())):
+                with self.subTest(text=text, source=source):
+                    visited = []
+                    self.assertListEqual([], list(json_stream.visit_many(source, lambda a, b: visited.append((a, b)))))
+                    self.assertListEqual([], visited)
+
     def _assert_data_okay(self, visited):
         self.assertListEqual([
             (1, ('x',)),

{json_stream-2.5.0 → json_stream-2.5.2}/src/json_stream/tokenizer.py

@@ -45,6 +45,15 @@ class State:
     UNICODE_SURROGATE_START = 23
     UNICODE_SURROGATE_STRING_ESCAPE = 24
     UNICODE_SURROGATE = 25
+    NAN_1 = 26
+    NAN_2 = 27
+    INF_1 = 28
+    INF_2 = 29
+    INF_3 = 30
+    INF_4 = 31
+    INF_5 = 32
+    INF_6 = 33
+    INF_7 = 34
 
 
 class SpecialChar:
@@ -130,6 +139,10 @@ def tokenize(stream):
                 next_state = State.TRUE_1
             elif char == "n":
                 next_state = State.NULL_1
+            elif char == "N":
+                next_state = State.NAN_1
+            elif char == "I":
+                next_state = State.INF_1
             elif not char.isspace() and not char == SpecialChar.EOF:
                 raise ValueError("Invalid JSON character: '{0}'".format(char))
         elif state == State.INTEGER:
@@ -169,8 +182,10 @@ def tokenize(stream):
             elif char in "123456789":
                 next_state = State.INTEGER
                 add_char = True
+            elif char == "I":
+                next_state = State.INF_1
             else:
-                raise ValueError("A - must be followed by a digit.  Got '{0}'".format(char))
+                raise ValueError("A - must be followed by a digit or Infinity.  Got '{0}'".format(char))
         elif state == State.INTEGER_EXP_0:
             if char == "+" or char == "-" or char in "0123456789":
                 next_state = State.INTEGER_EXP
@@ -262,6 +277,55 @@ def tokenize(stream):
                 now_token = (TokenType.NULL, None)
             else:
                 raise ValueError("Invalid JSON character: '{0}'".format(char))
+        elif state == State.NAN_1:
+            if char == "a":
+                next_state = State.NAN_2
+            else:
+                raise ValueError("Invalid JSON character: '{0}'".format(char))
+        elif state == State.NAN_2:
+            if char == "N":
+                next_state = State.WHITESPACE
+                completed = True
+                now_token = (TokenType.NUMBER, float("NaN"))
+            else:
+                raise ValueError("Invalid JSON character: '{0}'".format(char))
+        elif state == State.INF_1:
+            if char == "n":
+                next_state = State.INF_2
+            else:
+                raise ValueError("Invalid JSON character: '{0}'".format(char))
+        elif state == State.INF_2:
+            if char == "f":
+                next_state = State.INF_3
+            else:
+                raise ValueError("Invalid JSON character: '{0}'".format(char))
+        elif state == State.INF_3:
+            if char == "i":
+                next_state = State.INF_4
+            else:
+                raise ValueError("Invalid JSON character: '{0}'".format(char))
+        elif state == State.INF_4:
+            if char == "n":
+                next_state = State.INF_5
+            else:
+                raise ValueError("Invalid JSON character: '{0}'".format(char))
+        elif state == State.INF_5:
+            if char == "i":
+                next_state = State.INF_6
+            else:
+                raise ValueError("Invalid JSON character: '{0}'".format(char))
+        elif state == State.INF_6:
+            if char == "t":
+                next_state = State.INF_7
+            else:
+                raise ValueError("Invalid JSON character: '{0}'".format(char))
+        elif state == State.INF_7:
+            if char == "y":
+                next_state = State.WHITESPACE
+                completed = True
+                now_token = (TokenType.NUMBER, float("".join(token) + "Infinity"))
+            else:
+                raise ValueError("Invalid JSON character: '{0}'".format(char))
         elif state == State.STRING:
             if char == "\"":
                 completed = True

{json_stream-2.5.0 → json_stream-2.5.2}/src/json_stream/visitor.py

@@ -34,4 +34,7 @@ def visit_many(fp_or_iterator, visitor, tokenizer=default_tokenizer, **tokenizer
 
 
 def visit(fp_or_iterator, visitor, tokenizer=default_tokenizer, **tokenizer_kwargs):
-    next(visit_many(fp_or_iterator, visitor, tokenizer, **tokenizer_kwargs))
+    try:
+        next(visit_many(fp_or_iterator, visitor, tokenizer, **tokenizer_kwargs))
+    except StopIteration:
+        raise ValueError('No JSON value found') from None

{json_stream-2.5.0 → json_stream-2.5.2/src/json_stream.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json-stream
-Version: 2.5.0
+Version: 2.5.2
 Summary: Streaming JSON encoder and decoder
 Author-email: Jamie Cockburn <jamie_cockburn@hotmail.co.uk>
 License: Copyright (c) 2020 Jamie Cockburn