Support RDF schemas defined in turtle.

Author: Peter Amstutz

schema_salad/ref_resolver.py

@@ -12,6 +12,7 @@
 from aslist import aslist
 import rdflib
 from rdflib.namespace import RDF, RDFS, OWL
+import xml.sax
 
 _logger = logging.getLogger("salad")
 
@@ -129,7 +130,10 @@ def add_namespaces(self, ns):
 
     def add_schemas(self, ns, base_url):
         for sch in aslist(ns):
-            self.graph.parse(urlparse.urljoin(base_url, sch))
+            try:
+                self.graph.parse(urlparse.urljoin(base_url, sch), format="xml")
+            except xml.sax.SAXParseException:
+                self.graph.parse(urlparse.urljoin(base_url, sch), format="turtle")
 
         for s, _, _ in self.graph.triples( (None, RDF.type, RDF.Property) ):
             self._add_properties(s)

setup.py

@@ -17,7 +17,7 @@
     tagger = egg_info_cmd.egg_info
 
 setup(name='schema-salad',
-      version='1.5',
+      version='1.6',
       description='Schema Annotations for Linked Avro Data (SALAD)',
       long_description=open(README).read(),
       author='Common workflow language working group',