Merge 6682052 into 097789d

PyOpenWorm/context.py

@@ -393,9 +393,10 @@ def rdf_graph(self):
 class ClassContextMeta(ContextMeta):
 
     def __call__(self, ident):
-        res = ClassContexts.get(ident)
+        res = ClassContexts.get(URIRef(ident))
         if not res:
             res = super(ClassContextMeta, self).__call__(ident=ident)
+            ClassContexts[URIRef(ident)] = res
         return res
 
 

PyOpenWorm/context_store.py

@@ -25,6 +25,8 @@ def __init__(self, context=None, include_stored=False, **kwargs):
         super(ContextStore, self).__init__(**kwargs)
         self._memory_store = None
         self._include_stored = include_stored
+        self._namespaces = dict()
+        self._namespaces_r = dict()
         if context is not None:
             self._init_store(context)
 
@@ -129,6 +131,20 @@ def contexts(self, triple=None):
             seen.add(ctx)
             yield ctx
 
+    def namespace(self, prefix):
+        return self._namespaces.get(prefix)
+
+    def prefix(self, uri):
+        return self._namespaces_r.get(uri)
+
+    def bind(self, prefix, namespace):
+        self._namespaces[prefix] = namespace
+        self._namespaces_r[namespace] = prefix
+
+    def namespaces(self):
+        for x in self._namespaces.items():
+            yield x
+
 
 class RDFContextStore(Store):
     # Returns triples imported by the given context