Merge pull request #501 from joernhees/fix_hash

make Identifier.__hash__ consistent with str.__hash__ stability over runs, fixes #500

Author: joernhees

rdflib/term.py

@@ -183,7 +183,9 @@ def __ge__(self, other):
         return self == other
 
     def __hash__(self):
-        return hash(type(self)) ^ hash(unicode(self))
+        t = type(self)
+        fqn = t.__module__ + '.' + t.__name__
+        return hash(fqn) ^ hash(unicode(self))
 
 
 class URIRef(Identifier):
@@ -930,8 +932,12 @@ def __hash__(self):
         -- 6.5.1 Literal Equality (RDF: Concepts and Abstract Syntax)
 
         """
-
-        return unicode.__hash__(self) ^ hash(self.language.lower() if self.language else None) ^ hash(self.datatype)
+        res = super(Literal, self).__hash__()
+        if self.language:
+            res ^= hash(self.language.lower())
+        if self.datatype:
+            res ^= hash(self.datatype)
+        return res
 
     @py3compat.format_doctest_out
     def __eq__(self, other):