Merge remote-tracking branch 'agoose77/fix_schema_id'

* agoose77/fix_schema_id:
  Fix bug in current registration of validators

Author: Julian

jsonschema/tests/test_validators.py

@@ -76,18 +76,19 @@ def test_if_a_version_is_not_provided_it_is_not_registered(self):
             validators.create(meta_schema={u"id": "id"})
         self.assertFalse(validates.called)
 
-    def test_if_validates_registers_meta_schema_id(self):
+    def test_validates_registers_meta_schema_id(self):
         meta_schema_key = "meta schema id"
         my_meta_schema = {u"id": meta_schema_key}
 
         validators.create(
             meta_schema=my_meta_schema,
             version="my version",
+            id_of=lambda s: s.get("id", ""),
         )
 
         self.assertIn(meta_schema_key, validators.meta_schemas)
 
-    def test_if_validates_registers_meta_schema_draft6_id(self):
+    def test_validates_registers_meta_schema_draft6_id(self):
         meta_schema_key = "meta schema $id"
         my_meta_schema = {u"$id": meta_schema_key}
 
@@ -1052,6 +1053,7 @@ def test_custom_validator(self):
         Validator = validators.create(
             meta_schema={"id": "meta schema id"},
             version="12",
+            id_of=lambda s: s.get("id", ""),
         )
         schema = {"$schema": "meta schema id"}
         self.assertIs(

jsonschema/validators.py

@@ -36,9 +36,7 @@ def validates(version):
     Register the decorated validator for a ``version`` of the specification.
 
     Registered validators and their meta schemas will be considered when
-    parsing ``$schema`` properties' URIs. Meta schemas can use either
-    ``id`` or ``$id`` depending on whether they follow pre-draft6 or draft6
-    and later, respectively.
+    parsing ``$schema`` properties' URIs.
 
     Arguments:
 
@@ -54,10 +52,9 @@ def validates(version):
 
     def _validates(cls):
         validators[version] = cls
-        if u"id" in cls.META_SCHEMA:
-            meta_schemas[cls.META_SCHEMA[u"id"]] = cls
-        elif u"$id" in cls.META_SCHEMA:
-            meta_schemas[cls.META_SCHEMA[u"$id"]] = cls
+        meta_schema_id = cls.ID_OF(cls.META_SCHEMA)
+        if meta_schema_id:
+            meta_schemas[meta_schema_id] = cls
         return cls
     return _validates
 
@@ -208,6 +205,7 @@ class Validator(object):
         VALIDATORS = dict(validators)
         META_SCHEMA = dict(meta_schema)
         TYPE_CHECKER = type_checker
+        ID_OF = staticmethod(id_of)
 
         _DEFAULT_TYPES = dict(default_types)