fix misc things about jsonpatch correction

Author: rmorshea

src/idom/core/_fixed_jsonpatch.py

@@ -1,3 +1,5 @@
+# type: ignore
+
 """A patched version of jsonpatch
 
 We need this because of: https://github.com/stefankoegl/python-json-patch/issues/138
@@ -9,28 +11,37 @@
 from jsonpatch import _ST_REMOVE
 from jsonpatch import DiffBuilder as _DiffBuilder
 from jsonpatch import JsonPatch as _JsonPatch
-from jsonpatch import RemoveOperation, _path_join
+from jsonpatch import RemoveOperation, _path_join, basestring
+from jsonpointer import JsonPointer
 
 
-def apply_patch(doc, patch, in_place=False):
-    if isinstance(patch, (str, bytes)):
-        patch = JsonPatch.from_string(patch)
+def apply_patch(doc, patch, in_place=False, pointer_cls=JsonPointer):
+    if isinstance(patch, basestring):
+        patch = JsonPatch.from_string(patch, pointer_cls=pointer_cls)
     else:
-        patch = JsonPatch(patch)
+        patch = JsonPatch(patch, pointer_cls=pointer_cls)
     return patch.apply(doc, in_place)
 
 
-def make_patch(src, dst):
-    return JsonPatch.from_diff(src, dst)
+def make_patch(src, dst, pointer_cls=JsonPointer):
+    return JsonPatch.from_diff(src, dst, pointer_cls=pointer_cls)
 
 
 class JsonPatch(_JsonPatch):
     @classmethod
-    def from_diff(cls, src, dst, optimization=True):
-        builder = DiffBuilder()
+    def from_diff(
+        cls,
+        src,
+        dst,
+        optimization=True,
+        dumps=None,
+        pointer_cls=JsonPointer,
+    ):
+        json_dumper = dumps or cls.json_dumper
+        builder = DiffBuilder(src, dst, json_dumper, pointer_cls=pointer_cls)
         builder._compare_values("", None, src, dst)
         ops = list(builder.execute())
-        return cls(ops)
+        return cls(ops, pointer_cls=pointer_cls)
 
 
 class DiffBuilder(_DiffBuilder):

src/idom/core/dispatcher.py

@@ -22,7 +22,7 @@
 
 from idom.utils import Ref
 
-from ._fixed_jsonpatch import apply_patch, make_patch
+from ._fixed_jsonpatch import apply_patch, make_patch  # type: ignore
 from .layout import LayoutEvent, LayoutUpdate
 from .proto import LayoutType, VdomJson
 

src/idom/testing.py

@@ -202,9 +202,10 @@ def assert_idom_logged(
                 message_pattern.findall(record.getMessage())
                 # error type matches
                 and (
-                    not error_type
+                    error_type is None
                     or (
                         record.exc_info is not None
+                        and record.exc_info[0] is not None
                         and issubclass(record.exc_info[0], error_type)
                     )
                 )