Move Store API to work with identifiers, not graphs

docs/plugintable.py

@@ -1,5 +1,5 @@
 """
-Crappy utility for generating Sphinx tables 
+Crappy utility for generating Sphinx tables
 for rdflib plugins
 """
 
@@ -11,23 +11,22 @@
 
 p = {}
 
-for (name, kind), plugin in _plugins.items(): 
+for (name, kind), plugin in _plugins.items():
     if "/" in name: continue # skip duplicate entries for mimetypes
-    if cls == kind.__name__: 
+    if cls == kind.__name__:
         p[name]="%s.%s"%(plugin.module_path, plugin.class_name)
 
 l1=max(len(x) for x in p)
 l2=max(10+len(x) for x in p.values())
 
 def hr():
-    print "="*l1,"="*l2
+    print("="*l1,"="*l2)
 
 hr()
-print "%-*s"%(l1,"Name"), "%-*s"%(l2, "Class")
+print("%-*s"%(l1,"Name"), "%-*s"%(l2, "Class"))
 hr()
 
-for n in sorted(p): 
-    print "%-*s"%(l1,n), ":class:`~%s`"%p[n]
+for n in sorted(p):
+    print("%-*s"%(l1,n), ":class:`~%s`"%p[n])
 hr()
-print 
-
+print()

examples/conjunctive_graphs.py

@@ -53,6 +53,6 @@
 
     # query the conjunction of all graphs
 
-    print 'Mary loves:'
+    print('Mary loves:')
     for x in g[mary : ns.loves/ns.hasName]:
-        print x
+        print(x)

examples/custom_datatype.py

@@ -1,6 +1,6 @@
 """
 
-RDFLib can map between data-typed literals and python objects. 
+RDFLib can map between data-typed literals and python objects.
 
 Mapping for integers, floats, dateTimes, etc. are already added, but
 you can also add your own.
@@ -17,9 +17,9 @@
 if __name__=='__main__':
 
     # complex numbers are not registered by default
-    # no custom constructor/serializer needed since 
+    # no custom constructor/serializer needed since
     # complex('(2+3j)') works fine
-    bind(XSD.complexNumber, complex) 
+    bind(XSD.complexNumber, complex)
 
     ns=Namespace("urn:my:namespace:")
 
@@ -39,8 +39,6 @@
 
     l2=list(g2)[0][2]
 
-    print l2 
-
-    print l2.value == c # back to a python complex object
-
+    print(l2)
 
+    print(l2.value == c) # back to a python complex object

examples/custom_eval.py

@@ -65,4 +65,4 @@ def customEval(ctx, part):
     # Find all FOAF Agents
     for x in g.query(
             'PREFIX foaf: <%s> SELECT * WHERE { ?s a foaf:Agent . }' % FOAF):
-        print x
+        print(x)

examples/film.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-""" 
+"""
 
 film.py: a simple tool to manage your movies review
 Simon Rozet, http://atonie.org/
@@ -10,7 +10,7 @@
 - handle non IMDB uri
 - markdown support in comment
 
-Requires download and import of Python imdb library from 
+Requires download and import of Python imdb library from
 http://imdbpy.sourceforge.net/ - (warning: installation
 will trigger automatic installation of several other packages)
 
@@ -25,14 +25,14 @@
 """
 import datetime, os, sys, re, time
 
-try: 
+try:
     import imdb
-except ImportError: 
+except ImportError:
     imdb = None
 
 from rdflib import BNode, ConjunctiveGraph, URIRef, Literal, Namespace, RDF
 from rdflib.namespace import FOAF, DC
-
+from rdflib.py3compat import input
 
 storefn = os.path.expanduser('~/movies.n3')
 #storefn = '/home/simon/codes/film.dev/movies.n3'
@@ -53,10 +53,10 @@ def __init__(self):
         self.graph.bind('foaf', FOAF)
         self.graph.bind('imdb', IMDB)
         self.graph.bind('rev', 'http://purl.org/stuff/rev#')
-    
+
     def save(self):
         self.graph.serialize(storeuri, format='n3')
-    
+
     def who(self, who=None):
         if who is not None:
             name, email = (r_who.match(who).group(1), r_who.match(who).group(2))
@@ -67,14 +67,14 @@ def who(self, who=None):
             self.save()
         else:
             return self.graph.objects(URIRef(storeuri+'#author'), FOAF['name'])
-        
+
     def new_movie(self, movie):
         movieuri = URIRef('http://www.imdb.com/title/tt%s/' % movie.movieID)
         self.graph.add((movieuri, RDF.type, IMDB['Movie']))
         self.graph.add((movieuri, DC['title'], Literal(movie['title'])))
         self.graph.add((movieuri, IMDB['year'], Literal(int(movie['year']))))
         self.save()
-    
+
     def new_review(self, movie, date, rating, comment=None):
         review = BNode() # @@ humanize the identifier (something like #rev-$date)
         movieuri = URIRef('http://www.imdb.com/title/tt%s/' % movie.movieID)
@@ -91,7 +91,7 @@ def new_review(self, movie, date, rating, comment=None):
 
     def movie_is_in(self, uri):
         return (URIRef(uri), RDF.type, IMDB['Movie']) in self.graph
-        
+
 def help():
     print(__doc__.split('--')[1])
 
@@ -121,22 +121,22 @@ def main(argv=None):
             rating = None
             while not rating or (rating > 5 or rating <= 0):
                 try:
-                    rating = int(raw_input('Rating (on five): '))
+                    rating = int(input('Rating (on five): '))
                 except ValueError:
                     rating = None
             date = None
             while not date:
                 try:
-                    i = raw_input('Review date (YYYY-MM-DD): ')
+                    i = input('Review date (YYYY-MM-DD): ')
                     date = datetime.datetime(*time.strptime(i, '%Y-%m-%d')[:6])
                 except:
                     date = None
-            comment = raw_input('Comment: ')
+            comment = input('Comment: ')
             s.new_review(movie, date, rating, comment)
     else:
         help()
 
 if __name__ == '__main__':
-    if not imdb: 
+    if not imdb:
         raise Exception('This example requires the IMDB library! Install with "pip install imdbpy"')
     main()

examples/foafpaths.py

@@ -4,7 +4,7 @@
 in triple-patterns.
 
 We overload some python operators on URIRefs to allow creating path
-operators directly in python. 
+operators directly in python.
 
 ============ =========================================
 Operator     Path
@@ -13,7 +13,7 @@
 ``p1 | p2``  Path alternative
 ``p1 * '*'`` chain of 0 or more p's
 ``p1 * '+'`` chain of 1 or more p's
-``p1 * '?'`` 0 or 1 p 
+``p1 * '?'`` 0 or 1 p
 ``~p1``      p1 inverted, i.e. (s p1 o) <=> (o ~p1 s)
 ``-p1``      NOT p1, i.e. any property but p1
 ============ =========================================
@@ -38,7 +38,7 @@
 
     tim = URIRef("http://www.w3.org/People/Berners-Lee/card#i")
 
-    print "Timbl knows:"
+    print("Timbl knows:")
 
     for o in g.objects(tim, FOAF.knows / FOAF.name):
-        print o
+        print(o)

examples/prepared_query.py

@@ -4,7 +4,7 @@
 SPARQL Queries be prepared (i.e parsed and translated to SPARQL algebra)
 by the :meth:`rdflib.plugins.sparql.prepareQuery` method.
 
-When executing, variables can be bound with the 
+When executing, variables can be bound with the
 ``initBindings`` keyword parameter
 
 
@@ -17,7 +17,7 @@
 if __name__=='__main__':
 
     q = prepareQuery(
-        'SELECT ?s WHERE { ?person foaf:knows ?s .}', 
+        'SELECT ?s WHERE { ?person foaf:knows ?s .}',
         initNs = { "foaf": FOAF })
 
     g = rdflib.Graph()
@@ -26,4 +26,4 @@
     tim = rdflib.URIRef("http://www.w3.org/People/Berners-Lee/card#i")
 
     for row in g.query(q, initBindings={'person': tim}):
-        print row
+        print(row)

examples/rdfa_example.py

@@ -1,5 +1,5 @@
 """
- 
+
 A simple example showing how to process RDFa from the web
 
 """
@@ -11,12 +11,12 @@
 
     g.parse('http://www.worldcat.org/title/library-of-babel/oclc/44089369', format='rdfa')
 
-    print "Books found:"
+    print("Books found:")
 
-    for row in g.query("""SELECT ?title ?author WHERE { 
-       [ a schema:Book ; 
+    for row in g.query("""SELECT ?title ?author WHERE {
+       [ a schema:Book ;
          schema:author [ rdfs:label ?author ] ;
          schema:name ?title ]
        FILTER (LANG(?title) = 'en') } """):
 
-        print "%s by %s"%(row.title, row.author)
+        print("%s by %s"%(row.title, row.author))

examples/resource.py

@@ -32,20 +32,18 @@
 
     # Resources returned when querying are 'auto-boxed' as resources:
 
-    print "Bill's friend: ", bill.value(FOAF.knows).value(FOAF.name)
+    print("Bill's friend: ", bill.value(FOAF.knows).value(FOAF.name))
 
-    # slicing ([] syntax) can also be used: 
+    # slicing ([] syntax) can also be used:
 
-    print "Bill knows: ",
-    for friend in bill[FOAF.knows]: 
-        print friend[FOAF.name].next(), " "
+    print("Bill knows: ")
+    for friend in bill[FOAF.knows]:
+        print(next(friend[FOAF.name]))
 
     # or even quicker with paths:
-    print "Bill knows: ",
+    print("Bill knows: ")
     for friend in bill[FOAF.knows/FOAF.name]:
-        print friend
+        print(friend)
 
     # setting single properties is also possible:
     bill[RDFS.label]=Literal("William")
-
-    print g.serialize(format='n3')

examples/simple_example.py

@@ -19,35 +19,34 @@
     store.add((donna, FOAF.name, Literal("Donna Fales")))
 
     # Iterate over triples in store and print them out.
-    print "--- printing raw triples ---"
+    print("--- printing raw triples ---")
     for s, p, o in store:
-        print s, p, o
+        print(s, p, o)
 
     # For each foaf:Person in the store print out its mbox property.
-    print "--- printing mboxes ---"
+    print("--- printing mboxes ---")
     for person in store.subjects(RDF.type, FOAF["Person"]):
         for mbox in store.objects(person, FOAF["mbox"]):
-            print mbox
+            print(mbox)
 
     # Serialize the store as RDF/XML to the file donna_foaf.rdf.
     store.serialize("donna_foaf.rdf", format="pretty-xml", max_depth=3)
 
     # Let's show off the serializers
 
-    print "RDF Serializations:"
+    print("RDF Serializations:")
 
     # Serialize as XML
-    print "--- start: rdf-xml ---"
-    print store.serialize(format="pretty-xml")
-    print "--- end: rdf-xml ---\n"
+    print("--- start: rdf-xml ---")
+    print(store.serialize(format="pretty-xml"))
+    print("--- end: rdf-xml ---\n")
 
     # Serialize as Turtle
-    print "--- start: turtle ---"
-    print store.serialize(format="turtle")
-    print "--- end: turtle ---\n"
+    print("--- start: turtle ---")
+    print(store.serialize(format="turtle"))
+    print("--- end: turtle ---\n")
 
     # Serialize as NTriples
-    print "--- start: ntriples ---"
-    print store.serialize(format="nt")
-    print "--- end: ntriples ---\n"
-
+    print("--- start: ntriples ---")
+    print(store.serialize(format="nt"))
+    print("--- end: ntriples ---\n")

examples/sleepycat_example.py

@@ -15,7 +15,7 @@
 
     # Open previously created store, or create it if it doesn't exist yet
     graph = ConjunctiveGraph('Sleepycat')
-    
+
     rt = graph.open(path, create=False)
 
     if rt == NO_STORE:
@@ -24,7 +24,7 @@
     else:
         assert rt == VALID_STORE, 'The underlying store is corrupt'
 
-    print 'Triples in graph before add: ', len(graph)
+    print('Triples in graph before add: ', len(graph))
 
     # Now we'll add some triples to the graph & commit the changes
     rdflib = Namespace('http://rdflib.net/test/')
@@ -33,28 +33,28 @@
     graph.add((rdflib['pic:1'], rdflib.name, Literal('Jane & Bob')))
     graph.add((rdflib['pic:2'], rdflib.name, Literal('Squirrel in Tree')))
 
-    print 'Triples in graph after add: ', len(graph)
+    print('Triples in graph after add: ', len(graph))
 
     # display the graph in RDF/XML
-    print graph.serialize(format='n3')
+    print(graph.serialize(format='n3'))
 
-    # close when done, otherwise sleepycat will leak lock entries. 
+    # close when done, otherwise sleepycat will leak lock entries.
     graph.close()
-    
+
     graph = None
-    
+
     # reopen the graph
-    
+
     graph = ConjunctiveGraph('Sleepycat')
-    
-    graph.open(path, create = False) 
-    
-    print 'Triples still in graph: ', len(graph)
-    
+
+    graph.open(path, create = False)
+
+    print('Triples still in graph: ', len(graph))
+
     graph.close()
 
     # Clean up the temp folder to remove the Sleepycat database files...
     import os
-    for f in os.listdir(path): 
+    for f in os.listdir(path):
         os.unlink(path+'/'+f)
     os.rmdir(path)