jsonpointer 3.2.1__tar.gz → 3.3__tar.gz

{jsonpointer-3.2.1/jsonpointer.egg-info → jsonpointer-3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jsonpointer
-Version: 3.2.1
+Version: 3.3
 Summary:  Identify specific nodes in a JSON document (RFC 6901) 
 Home-page: https://github.com/stefankoegl/python-json-pointer
 Author: Stefan Kögl

{jsonpointer-3.2.1 → jsonpointer-3.3}/bin/jsonpointer

@@ -27,6 +27,8 @@ parser.add_argument('FILE', type=str, nargs='+',
                     help='Files for which the pointer should be resolved')
 parser.add_argument('--indent', type=int, default=None,
                     help='Indent output by n spaces')
+parser.add_argument('--continue-on-error', action='store_true',
+                    help='Continue with remaining files after JSON or text decoding errors')
 parser.add_argument('-v', '--version', action='version',
                     version='%(prog)s ' + jsonpointer.__version__)
 
@@ -77,8 +79,8 @@ def parse_pointer(args):
 def resolve_files():
     """ Resolve a JSON pointer on JSON files
 
-    Returns False if the pointer could not be resolved on at least one
-    file. """
+    Returns False if the pointer could not be resolved on at least one file,
+    or if --continue-on-error skipped a JSON or text decoding error. """
     args = parser.parse_args()
 
     ptr, files = parse_pointer(args)
@@ -90,7 +92,16 @@ def resolve_files():
         except argparse.ArgumentTypeError as e:
             parser.error(str(e))
 
-        doc = json.load(f)
+        try:
+            doc = json.load(f)
+        except (json.JSONDecodeError, UnicodeDecodeError) as e:
+            if not args.continue_on_error:
+                raise
+            print('Could not parse JSON in %r: %s' % (name, e),
+                  file=sys.stderr)
+            ok = False
+            continue
+
         try:
             result = jsonpointer.resolve_pointer(doc, ptr)
             print(json.dumps(result, indent=args.indent))

{jsonpointer-3.2.1 → jsonpointer-3.3/jsonpointer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jsonpointer
-Version: 3.2.1
+Version: 3.3
 Summary:  Identify specific nodes in a JSON document (RFC 6901) 
 Home-page: https://github.com/stefankoegl/python-json-pointer
 Author: Stefan Kögl

{jsonpointer-3.2.1 → jsonpointer-3.3}/jsonpointer.py

@@ -32,7 +32,7 @@
 
 # Will be parsed by setup.py to determine package metadata
 __author__ = 'Stefan Kögl <stefan@skoegl.net>'
-__version__ = '3.2.1'
+__version__ = '3.3'
 __website__ = 'https://github.com/stefankoegl/python-json-pointer'
 __license__ = 'Modified BSD License'
 
@@ -307,7 +307,7 @@ class JsonPointer:
             suffix_parts = suffix
         try:
             return self.__class__.from_parts(chain(self.parts, suffix_parts))
-        except:  # noqa E722
+        except Exception:
             raise JsonPointerException("Invalid suffix")
 
     def __truediv__(self, suffix):

{jsonpointer-3.2.1 → jsonpointer-3.3}/tests.py

@@ -196,6 +196,19 @@ class ComparisonTests(unittest.TestCase):
         ptr12e = self.ptr1 / ["a", "b"]
         self.assertEqual(ptr12e.path, "/a/b/c/a/b")
 
+    def test_join_preserves_control_flow_exceptions(self):
+        for exception_type in (KeyboardInterrupt, SystemExit, GeneratorExit):
+            with self.subTest(exception_type=exception_type):
+                error = exception_type()
+
+                def parts():
+                    yield 'valid'
+                    raise error
+
+                with self.assertRaises(exception_type) as caught:
+                    self.ptr1.join(parts())
+                self.assertIs(caught.exception, error)
+
     def test_join_subclass(self):
         class Pointer(JsonPointer):
             pass
@@ -494,7 +507,7 @@ class CommandLineTests(unittest.TestCase):
             f.write(content)
 
     def _run(self, *args):
-        env = dict(os.environ, PYTHONPATH=self.ROOT)
+        env = dict(os.environ, PYTHONPATH=self.ROOT, PYTHONUTF8='1')
         return subprocess.run([sys.executable, self.SCRIPT] + list(args),
                               cwd=self.dir, env=env, capture_output=True,
                               text=True)
@@ -571,6 +584,92 @@ class CommandLineTests(unittest.TestCase):
         self.assertIn('Could not resolve pointer', proc.stderr)
         self.assertEqual(proc.stdout, '1\n')
 
+    def test_invalid_json(self):
+        for content in ('', '{"a": }', '{"a": 1}\n{"a": 2}'):
+            with self.subTest(content=content):
+                self._write('invalid.json', content)
+                proc = self._run('--continue-on-error', '/a', 'invalid.json')
+                self.assertEqual(proc.returncode, 1)
+                self.assertEqual(proc.stdout, '')
+                self.assertIn("Could not parse JSON in 'invalid.json':",
+                              proc.stderr)
+                self.assertIn('line ', proc.stderr)
+                self.assertNotIn('Traceback', proc.stderr)
+
+    def test_invalid_json_in_one_file(self):
+        self._write('invalid.json', '{"a": }')
+        for index in range(3):
+            with self.subTest(index=index):
+                files = ['a.json', 'b.json']
+                files.insert(index, 'invalid.json')
+                proc = self._run('--continue-on-error', '/a', *files)
+                self.assertEqual(proc.returncode, 1)
+                self.assertEqual(proc.stdout, self.A_OUT + self.B_OUT)
+                self.assertIn("Could not parse JSON in 'invalid.json':",
+                              proc.stderr)
+                self.assertNotIn('Traceback', proc.stderr)
+
+    def test_invalid_json_and_unresolvable_pointer(self):
+        self._write('invalid.json', '{"a": }')
+        proc = self._run('--continue-on-error', '/b',
+                         'invalid.json', 'a.json', 'b.json')
+        self.assertEqual(proc.returncode, 1)
+        self.assertEqual(proc.stdout, '1\n')
+        self.assertIn("Could not parse JSON in 'invalid.json':", proc.stderr)
+        self.assertIn('Could not resolve pointer:', proc.stderr)
+        self.assertNotIn('Traceback', proc.stderr)
+
+    def test_invalid_json_stops_without_continue_on_error(self):
+        self._write('invalid.json', '{"a": }')
+        for index in range(3):
+            with self.subTest(index=index):
+                files = ['a.json', 'b.json']
+                files.insert(index, 'invalid.json')
+                proc = self._run('/a', *files)
+                self.assertEqual(proc.returncode, 1)
+                self.assertEqual(proc.stdout,
+                                 ''.join([self.A_OUT, self.B_OUT][:index]))
+                self.assertIn('JSONDecodeError', proc.stderr)
+
+    def test_invalid_encoding_in_one_file(self):
+        with open(os.path.join(self.dir, 'invalid.json'), 'wb') as f:
+            f.write(b'{"a":"\xff"}')
+        for index in range(3):
+            with self.subTest(index=index):
+                files = ['a.json', 'b.json']
+                files.insert(index, 'invalid.json')
+                proc = self._run('--continue-on-error', '/a', *files)
+                self.assertEqual(proc.returncode, 1)
+                self.assertEqual(proc.stdout, self.A_OUT + self.B_OUT)
+                self.assertIn("Could not parse JSON in 'invalid.json':",
+                              proc.stderr)
+                self.assertIn('decode', proc.stderr)
+                self.assertNotIn('Traceback', proc.stderr)
+
+    def test_invalid_encoding_stops_without_continue_on_error(self):
+        with open(os.path.join(self.dir, 'invalid.json'), 'wb') as f:
+            f.write(b'{"a":"\xff"}')
+        proc = self._run('/a', 'a.json', 'invalid.json', 'b.json')
+        self.assertEqual(proc.returncode, 1)
+        self.assertEqual(proc.stdout, self.A_OUT)
+        self.assertIn('UnicodeDecodeError', proc.stderr)
+
+    def test_continue_on_error_with_valid_files(self):
+        for pointer in (['/a'], ['-p', '/a'], ['-f', 'ptr.txt']):
+            with self.subTest(pointer=pointer):
+                proc = self._run('--continue-on-error', *pointer,
+                                 'a.json', 'b.json')
+                self.assertEqual(proc.returncode, 0, proc.stderr)
+                self.assertEqual(proc.stdout, self.A_OUT + self.B_OUT)
+                self.assertEqual(proc.stderr, '')
+
+    def test_continue_on_error_does_not_skip_missing_files(self):
+        proc = self._run('--continue-on-error', '/a',
+                         'a.json', 'missing.json', 'b.json')
+        self.assertEqual(proc.returncode, 2)
+        self.assertEqual(proc.stdout, self.A_OUT)
+        self.assertIn('missing.json', proc.stderr)
+
     def test_pointer_file_requires_value(self):
         proc = self._run('-f', '-p', '/a', 'a.json')
         self.assertEqual(proc.returncode, 2)