Merge pull request #77 from gazpachoking/canonical_schema_uris

Make sure empty fragment and no fragment are the same in $schema

Author: gazpachoking

jsonschema.py

@@ -22,6 +22,11 @@
 import socket
 import sys
 
+try:
+    from collections import MutableMapping
+except ImportError:
+    from collections.abc import MutableMapping
+
 try:
     import requests
 except ImportError:
@@ -48,7 +53,6 @@
 
 FLOAT_TOLERANCE = 10 ** -15
 validators = {}
-meta_schemas = {}
 
 
 class _Error(Exception):
@@ -68,6 +72,41 @@ class RefResolutionError(Exception): pass
 class UnknownType(Exception): pass
 
 
+class _URIDict(MutableMapping):
+    """
+    Dictionary which uses normalized URIs as keys.
+
+    """
+
+    def normalize(self, uri):
+        return urlparse.urlsplit(uri).geturl()
+
+    def __init__(self, *args, **kwargs):
+        self.store = dict()
+        self.store.update(*args, **kwargs)
+
+    def __getitem__(self, uri):
+        return self.store[self.normalize(uri)]
+
+    def __setitem__(self, uri, value):
+        self.store[self.normalize(uri)] = value
+
+    def __delitem__(self, uri):
+        del self.store[self.normalize(uri)]
+
+    def __iter__(self):
+        return iter(self.store)
+
+    def __len__(self):
+        return len(self.store)
+
+    def __repr__(self):
+        return repr(self.store)
+
+
+meta_schemas = _URIDict()
+
+
 def validates(version):
     """
     Register the decorated validator for a ``version`` of the specification.
@@ -923,7 +962,7 @@ def __init__(self, base_uri, referrer, store=(), cache_remote=True,
         self.base_uri = base_uri
         self.resolution_scope = base_uri
         self.referrer = referrer
-        self.store = dict(store, **_meta_schemas())
+        self.store = _URIDict(store, **_meta_schemas())
         self.cache_remote = cache_remote
         self.handlers = dict(handlers)
 
@@ -1239,6 +1278,6 @@ def _uniq(container):
 
 def validate(instance, schema, cls=None, *args, **kwargs):
     if cls is None:
-        cls = meta_schemas.get(schema.get("$schema"), Draft4Validator)
+        cls = meta_schemas.get(schema.get("$schema", ""), Draft4Validator)
     cls.check_schema(schema)
     cls(schema, *args, **kwargs).validate(instance)

tests.py

@@ -592,6 +592,11 @@ def test_draft3_validator_is_chosen(self):
         with mock.patch.object(Draft3Validator, "check_schema") as chk_schema:
             validate({}, schema)
             chk_schema.assert_called_once_with(schema)
+        # Make sure it works without the empty fragment
+        schema = {"$schema" : "http://json-schema.org/draft-03/schema"}
+        with mock.patch.object(Draft3Validator, "check_schema") as chk_schema:
+            validate({}, schema)
+            chk_schema.assert_called_once_with(schema)
 
     def test_draft4_validator_is_chosen(self):
         schema = {"$schema" : "http://json-schema.org/draft-04/schema#"}