From 4dc82340e04f1f445e072952ec03a3e9f544bc66 Mon Sep 17 00:00:00 2001 From: kafkaf- Date: Wed, 5 Nov 2014 23:06:31 +0200 Subject: Catching a broad exception to ensure the return of the default, added tests, fixed a bug where obj.contains(obj) returned false, added test case --- jsonpointer.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'jsonpointer.py') diff --git a/jsonpointer.py b/jsonpointer.py index ee7f266..02aa594 100644 --- a/jsonpointer.py +++ b/jsonpointer.py @@ -166,7 +166,8 @@ class JsonPointer(object): try: doc = self.walk(doc, part) - except JsonPointerException: + # Catching a broad exception to ensure the return of the default + except: if default is _nothing: raise else: @@ -215,7 +216,7 @@ class JsonPointer(object): else: raise JsonPointerException("Document '%s' does not support indexing, " - "must be dict/list or support __getitem__" % type(doc)) + "must be mapping/sequence or support __getitem__" % type(doc)) def walk(self, doc, part): @@ -249,7 +250,7 @@ class JsonPointer(object): def contains(self, ptr): """ Returns True if self contains the given ptr """ - return len(self.parts) > len(ptr.parts) and \ + return len(self.parts) >= len(ptr.parts) and \ self.parts[:len(ptr.parts)] == ptr.parts @property -- cgit v1.2.1 From ec26151db15c241e29c7730dc12657434370ff67 Mon Sep 17 00:00:00 2001 From: kafkaf- Date: Fri, 14 Nov 2014 16:05:00 +0200 Subject: Removed unrelated changes to the contains method, reverted the exception handle --- jsonpointer.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'jsonpointer.py') diff --git a/jsonpointer.py b/jsonpointer.py index 02aa594..b3f0362 100644 --- a/jsonpointer.py +++ b/jsonpointer.py @@ -166,8 +166,7 @@ class JsonPointer(object): try: doc = self.walk(doc, part) - # Catching a broad exception to ensure the return of the default - except: + except JsonPointerException: if default is _nothing: raise else: @@ -250,7 +249,7 @@ class JsonPointer(object): def contains(self, ptr): """ Returns True if self contains the given ptr """ - return len(self.parts) >= len(ptr.parts) and \ + return len(self.parts) > len(ptr.parts) and \ self.parts[:len(ptr.parts)] == ptr.parts @property -- cgit v1.2.1 From 4c5cb493f2a8e41fd05b9b25df419701e215812a Mon Sep 17 00:00:00 2001 From: kafkaf- Date: Fri, 14 Nov 2014 16:18:39 +0200 Subject: Using the same handling for the case in which the doc is a mapping or an object that support __getitem__(but not a sequence), Updated the tests --- jsonpointer.py | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'jsonpointer.py') diff --git a/jsonpointer.py b/jsonpointer.py index b3f0362..06d2cb7 100644 --- a/jsonpointer.py +++ b/jsonpointer.py @@ -225,15 +225,7 @@ class JsonPointer(object): assert (type(doc) in (dict, list) or hasattr(doc, '__getitem__')), "invalid document type %s" % (type(doc),) - if isinstance(doc, Mapping): - try: - return doc[part] - - except KeyError: - raise JsonPointerException("member '%s' not found in %s" % (part, doc)) - - elif isinstance(doc, Sequence): - + if isinstance(doc, Sequence): if part == '-': return EndOfList(doc) @@ -243,10 +235,14 @@ class JsonPointer(object): except IndexError: raise JsonPointerException("index '%s' is out of bounds" % (part, )) - else: - # Object supports __getitem__, assume custom indexing + # Else the object is a mapping or supports __getitem__(so assume custom indexing) + try: return doc[part] + except KeyError: + raise JsonPointerException("member '%s' not found in %s" % (part, doc)) + + def contains(self, ptr): """ Returns True if self contains the given ptr """ return len(self.parts) > len(ptr.parts) and \ -- cgit v1.2.1 From 2ca270f01e7667366800e5648c2561d7072dd0e9 Mon Sep 17 00:00:00 2001 From: kafkaf- Date: Fri, 14 Nov 2014 16:19:32 +0200 Subject: Removed redundent assertion(part of it) --- jsonpointer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'jsonpointer.py') diff --git a/jsonpointer.py b/jsonpointer.py index 06d2cb7..e4c407d 100644 --- a/jsonpointer.py +++ b/jsonpointer.py @@ -223,7 +223,7 @@ class JsonPointer(object): part = self.get_part(doc, part) - assert (type(doc) in (dict, list) or hasattr(doc, '__getitem__')), "invalid document type %s" % (type(doc),) + assert hasattr(doc, '__getitem__'), "invalid document type %s" % (type(doc),) if isinstance(doc, Sequence): if part == '-': -- cgit v1.2.1