Changes so rdflib can be imported after installation in Python 3.

Author: takluyver

rdflib/store.py

@@ -233,7 +233,7 @@ def triples_choices(self, (subject, predicate, object_),context=None):
                 for (s1, p1, o1), cg in self.triples((subject,None,object_),context):
                         yield (s1, p1, o1), cg
 
-    def triples(self, (subject, predicate, object), context=None):
+    def triples(self, triple_pattern, context=None):
         """
         A generator over all the triples matching the pattern. Pattern can
         include any objects for used for comparing against nodes in the store, for
@@ -242,6 +242,7 @@ def triples(self, (subject, predicate, object), context=None):
         A conjunctive query can be indicated by either providing a value of None
         for the context or the identifier associated with the Conjunctive Graph (if it's context aware).
         """
+        subject, predicate, object = triple_pattern
 
     # variants of triples will be done if / when optimization is needed
 

rdflib/term.py

@@ -24,7 +24,7 @@
 
 import threading
 from urlparse import urlparse, urljoin, urldefrag
-from string import ascii_letters, rsplit
+from string import ascii_letters
 from random import choice
 from itertools import islice
 from datetime import date, time, datetime, timedelta
@@ -35,6 +35,8 @@
 except ImportError:
     from md5 import md5
 
+import py3compat
+
 class Node(object):
     """
     A Node in the Graph.
@@ -82,15 +84,15 @@ def n3(self):
 
     def concrete(self):
         if "#" in self:
-            return URIRef("/".join(rsplit(self, "#", 1)))
+            return URIRef("/".join(self.rsplit("#", 1)))
         else:
             return self
 
     def abstract(self):
         if "#" not in self:
             scheme, netloc, path, params, query, fragment = urlparse(self)
             if path:
-                return URIRef("#".join(rsplit(self, "/", 1)))
+                return URIRef("#".join(self.rsplit("/", 1)))
             else:
                 if not self.endswith("#"):
                     return URIRef("%s#" % self)
@@ -122,9 +124,13 @@ def __eq__(self, other):
             return unicode(self)==unicode(other)
         else:
             return False
+    
+    def __hash__(self):
+        return hash(URIRef) ^ hash(unicode(self))
 
-    def __str__(self):
-        return self.encode()
+    if not py3compat.PY3:
+        def __str__(self):
+            return self.encode()
 
     def __repr__(self):
         if self.__class__ is URIRef:
@@ -226,9 +232,13 @@ def __eq__(self, other):
             return unicode(self)==unicode(other)
         else:
             return False
+    
+    def __hash__(self):
+        return hash(BNode) ^ hash(unicode(self))
 
-    def __str__(self):
-        return self.encode()
+    if not py3compat.PY3:
+        def __str__(self):
+            return self.encode()
 
     def __repr__(self):
         if self.__class__ is BNode:
@@ -694,8 +704,9 @@ def _quote_encode(self):
             return '"%s"' % self.replace('\n','\\n').replace('\\', '\\\\'
                             ).replace('"', '\\"')
 
-    def __str__(self):
-        return self.encode()
+    if not py3compat.PY3:
+        def __str__(self):
+            return self.encode()
 
     def __repr__(self):
         args = [super(Literal, self).__repr__()]

rdflib/util.py

@@ -30,7 +30,6 @@
 """
 
 from calendar import timegm
-from string import rsplit
 from time import altzone
 #from time import daylight
 from time import gmtime
@@ -119,11 +118,11 @@ def from_n3(s, default=None, backend=None):
         return URIRef(s[1:-1])
     elif s.startswith('"'):
         # TODO: would a regex be faster?
-        value, rest = rsplit(s, '"', 1)
+        value, rest = s.rsplit('"', 1)
         value = value[1:] # strip leading quote
         if rest.startswith("@"):
             if "^^" in rest:
-                language, rest = rsplit(rest, '^^', 1)
+                language, rest = rest.rsplit('^^', 1)
                 language = language[1:] # strip leading at sign
             else:
                 language = rest[1:] # strip leading at sign