Return metaschema loader from load_schema. Don't crash expanding identifier

fields when value is not a string.

Author: Peter Amstutz

schema_salad/metaschema/metaschema.yml

@@ -70,7 +70,7 @@ $graph:
     - "string: Unicode character sequence"
 
 
-- name: "Any"
+- name: Any
   type: enum
   symbols: ["#Any"]
   doc: |

schema_salad/ref_resolver.py

@@ -368,9 +368,10 @@ def resolve_all(self, document, base_url, file_base=None):
             for identifer in loader.identity_links:
                 if identifer in document and isinstance(document[identifer], list):
                     for n, v in enumerate(document[identifer]):
-                        document[identifer][n] = loader.expand_url(document[identifer][n], base_url, scoped=True)
-                        if document[identifer][n] not in loader.idx:
-                            loader.idx[document[identifer][n]] = document[identifer][n]
+                        if isinstance(document[identifer][n], basestring):
+                            document[identifer][n] = loader.expand_url(document[identifer][n], base_url, scoped=True)
+                            if document[identifer][n] not in loader.idx:
+                                loader.idx[document[identifer][n]] = document[identifer][n]
                 #else:
                 #    raise validate.ValidationException("identity field '%s' must be a string" % (document[identifer]))
 

schema_salad/schema.py

@@ -176,7 +176,7 @@ def load_schema(schema_ref, cache=None):
     # Make the Avro validation that will be used to validate the target document
     (avsc_names, avsc_obj) = make_avro_schema(schema_doc, document_loader)
 
-    return document_loader, avsc_names, schema_metadata
+    return document_loader, avsc_names, schema_metadata, metaschema_loader
 
 def load_and_validate(document_loader, avsc_names, document, strict):
     if isinstance(document, dict):