jsonpointer 3.1.1__py3-none-any.whl → 3.2.0__py3-none-any.whl

jsonpointer-3.2.0.data/scripts/jsonpointer

@@ -0,0 +1,104 @@
+#!python
+
+
+import argparse
+import json
+import sys
+
+import jsonpointer
+
+parser = argparse.ArgumentParser(
+    description='Resolve a JSON pointer on JSON files')
+
+# Accept pointer as option, as file or as first positional argument
+ptr_group = parser.add_mutually_exclusive_group()
+
+ptr_group.add_argument('-f', '--pointer-file', type=argparse.FileType('r'),
+                       help='File containing a JSON pointer expression')
+
+ptr_group.add_argument('-p', '--pointer', type=str,
+                       help='A JSON pointer expression')
+
+parser.add_argument('POINTER', type=str, nargs='?',
+                    help='A JSON pointer expression (if neither -f nor -p '
+                         'is given)')
+
+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('-v', '--version', action='version',
+                    version='%(prog)s ' + jsonpointer.__version__)
+
+
+def main():
+    try:
+        ok = resolve_files()
+    except KeyboardInterrupt:
+        sys.exit(1)
+
+    if not ok:
+        sys.exit(1)
+
+
+def parse_pointer(args):
+    """ Return the pointer and the list of files to resolve it on
+
+    If the pointer is given via -f or -p, a POINTER positional argument is
+    actually the first file. """
+    files = args.FILE
+
+    if args.pointer is not None or args.pointer_file is not None:
+        if args.POINTER is not None:
+            files = [args.POINTER] + files
+
+        if args.pointer is not None:
+            ptr = args.pointer
+        else:
+            ptr = args.pointer_file.read().strip()
+
+    elif args.POINTER is not None:
+        ptr = args.POINTER
+
+    else:
+        parser.error('a JSON pointer is required (POINTER, -p or -f)')
+
+    # Catches e.g. `jsonpointer a.json b.json`, where the pointer was omitted
+    # and the first file would otherwise be used as the pointer
+    try:
+        jsonpointer.JsonPointer(ptr)
+    except jsonpointer.JsonPointerException as e:
+        parser.error('invalid JSON pointer %r: %s' % (ptr, e))
+
+    return ptr, files
+
+
+def resolve_files():
+    """ Resolve a JSON pointer on JSON files
+
+    Returns False if the pointer could not be resolved on at least one
+    file. """
+    args = parser.parse_args()
+
+    ptr, files = parse_pointer(args)
+    ok = True
+
+    for name in files:
+        try:
+            f = argparse.FileType('r')(name)
+        except argparse.ArgumentTypeError as e:
+            parser.error(str(e))
+
+        doc = json.load(f)
+        try:
+            result = jsonpointer.resolve_pointer(doc, ptr)
+            print(json.dumps(result, indent=args.indent))
+        except jsonpointer.JsonPointerException as e:
+            print('Could not resolve pointer: %s' % str(e), file=sys.stderr)
+            ok = False
+
+    return ok
+
+
+if __name__ == "__main__":
+    main()

{jsonpointer-3.1.1.dist-info → jsonpointer-3.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jsonpointer
-Version: 3.1.1
+Version: 3.2.0
 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.0.dist-info/RECORD

@@ -0,0 +1,8 @@
+jsonpointer.py,sha256=80Ru4-pIHwq5TveZVxIJqp_oqoH3l4qtBabY95AtQJc,11409
+jsonpointer-3.2.0.data/scripts/jsonpointer,sha256=tXI8Sl-uL_RDnd7mVTa3HzabsesBybpV2gDcAfpXI0g,2946
+jsonpointer-3.2.0.dist-info/licenses/AUTHORS,sha256=TVgxnQ9ZyHvvWwez_k2w8ZwtfVVFsDTGv3tXyJu-9X8,113
+jsonpointer-3.2.0.dist-info/licenses/LICENSE.txt,sha256=2LJPFdRyiF94ii1umFhQ8mRie4YBKhe7JCyD8xDZB-U,1413
+jsonpointer-3.2.0.dist-info/METADATA,sha256=suE0BGiuliMr42SMgsqVgdGNXYSJCF44D5m3NlZENGM,2418
+jsonpointer-3.2.0.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+jsonpointer-3.2.0.dist-info/top_level.txt,sha256=BsUcar_C0nZzPGV2ackrJ9CpVU8_0W_pHYKwpdnWddM,12
+jsonpointer-3.2.0.dist-info/RECORD,,

{jsonpointer-3.1.1.dist-info → jsonpointer-3.2.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.1)
+Generator: setuptools (84.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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.1.1'
+__version__ = '3.2.0'
 __website__ = 'https://github.com/stefankoegl/python-json-pointer'
 __license__ = 'Modified BSD License'
 
@@ -43,6 +43,10 @@ from itertools import tee, chain
 
 _nothing = object()
 
+# If True, exceptions include the doc content in the error message.
+# Set to False to suppress potentially large document content from exceptions.
+VERBOSE_EXCEPTIONS = True
+
 
 def set_pointer(doc, pointer, value, inplace=True):
     """Resolves a pointer against doc and sets the value of the target within doc.
@@ -209,10 +213,15 @@ class JsonPointer:
 
         (parent, part) = self.to_last(doc)
 
-        if isinstance(parent, Sequence) and part == '-':
+        if isinstance(parent, str):
+            raise JsonPointerException("Cannot set value in a string")
+        elif isinstance(parent, Sequence) and part == '-':
             parent.append(value)
         else:
-            parent[part] = value
+            try:
+                parent[part] = value
+            except (TypeError, IndexError) as e:
+                raise JsonPointerException("Invalid assignment target: %s" % (e,))
 
         return doc
 
@@ -223,6 +232,9 @@ class JsonPointer:
         if isinstance(doc, Mapping):
             return part
 
+        elif isinstance(doc, str):
+            raise JsonPointerException("Cannot apply token '%s' to non-container type %s" % (part, type(doc)))
+
         elif isinstance(doc, Sequence):
 
             if part == '-':
@@ -231,7 +243,10 @@ class JsonPointer:
             if not JsonPointer._RE_ARRAY_INDEX.fullmatch(str(part)):
                 raise JsonPointerException("'%s' is not a valid sequence index" % part)
 
-            return int(part)
+            try:
+                return int(part)
+            except ValueError as e:
+                raise JsonPointerException("Invalid sequence index: %s" % (e,))
 
         elif hasattr(doc, '__getitem__'):
             # Allow indexing via ducktyping
@@ -269,7 +284,10 @@ class JsonPointer:
             return doc[part]
 
         except KeyError:
-            raise JsonPointerException("member '%s' not found in %s" % (part, doc))
+            if VERBOSE_EXCEPTIONS:
+                raise JsonPointerException("member '%s' not found in %s" % (part, doc))
+            else:
+                raise JsonPointerException("member '%s' not found" % (part,))
 
     def contains(self, ptr):
         """ Returns True if self contains the given ptr """
@@ -288,7 +306,7 @@ class JsonPointer:
         else:
             suffix_parts = suffix
         try:
-            return JsonPointer.from_parts(chain(self.parts, suffix_parts))
+            return self.__class__.from_parts(chain(self.parts, suffix_parts))
         except:  # noqa E722
             raise JsonPointerException("Invalid suffix")
 

jsonpointer-3.1.1.data/scripts/jsonpointer

@@ -1,66 +0,0 @@
-#!python
-
-
-import argparse
-import json
-import sys
-
-import jsonpointer
-
-parser = argparse.ArgumentParser(
-    description='Resolve a JSON pointer on JSON files')
-
-# Accept pointer as argument or as file
-ptr_group = parser.add_mutually_exclusive_group(required=True)
-
-ptr_group.add_argument('-f', '--pointer-file', type=argparse.FileType('r'),
-                       nargs='?',
-                       help='File containing a JSON pointer expression')
-
-ptr_group.add_argument('POINTER', type=str, nargs='?',
-                       help='A JSON pointer expression')
-
-parser.add_argument('FILE', type=argparse.FileType('r'), 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('-v', '--version', action='version',
-                    version='%(prog)s ' + jsonpointer.__version__)
-
-
-def main():
-    try:
-        resolve_files()
-    except KeyboardInterrupt:
-        sys.exit(1)
-
-
-def parse_pointer(args):
-    if args.POINTER:
-        ptr = args.POINTER
-    elif args.pointer_file:
-        ptr = args.pointer_file.read().strip()
-    else:
-        parser.print_usage()
-        sys.exit(1)
-
-    return ptr
-
-
-def resolve_files():
-    """ Resolve a JSON pointer on JSON files """
-    args = parser.parse_args()
-
-    ptr = parse_pointer(args)
-
-    for f in args.FILE:
-        doc = json.load(f)
-        try:
-            result = jsonpointer.resolve_pointer(doc, ptr)
-            print(json.dumps(result, indent=args.indent))
-        except jsonpointer.JsonPointerException as e:
-            print('Could not resolve pointer: %s' % str(e), file=sys.stderr)
-
-
-if __name__ == "__main__":
-    main()

jsonpointer-3.1.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-jsonpointer.py,sha256=j81llr7jMvEdAk44hFqYjnh-LA-uwuX-eR4VbRZcwnc,10551
-jsonpointer-3.1.1.data/scripts/jsonpointer,sha256=TJvaiCnkNs5scyGUQh9kUkBpW_ZHp16yEPFyViFfeyI,1749
-jsonpointer-3.1.1.dist-info/licenses/AUTHORS,sha256=TVgxnQ9ZyHvvWwez_k2w8ZwtfVVFsDTGv3tXyJu-9X8,113
-jsonpointer-3.1.1.dist-info/licenses/LICENSE.txt,sha256=2LJPFdRyiF94ii1umFhQ8mRie4YBKhe7JCyD8xDZB-U,1413
-jsonpointer-3.1.1.dist-info/METADATA,sha256=tGFCdFm3odWVWFugWp0EZrE0uEkgT03fvBse0gd1ul0,2418
-jsonpointer-3.1.1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-jsonpointer-3.1.1.dist-info/top_level.txt,sha256=BsUcar_C0nZzPGV2ackrJ9CpVU8_0W_pHYKwpdnWddM,12
-jsonpointer-3.1.1.dist-info/RECORD,,