Microdata to rdf second edition bak

.travis.yml

@@ -8,7 +8,7 @@ python:
     # - 2.5
     - 2.6
     - 2.7
-    - 3.2
+    # - 3.2
     - 3.3
     - 3.4
     # - "pypy"

rdflib/collection.py

@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from rdflib.namespace import RDF
 from rdflib.term import BNode
 from rdflib.term import Literal
@@ -260,7 +264,7 @@ def test():
 
     try:
         del c[500]
-    except IndexError, i:
+    except IndexError as i:
         pass
 
     c.append(Literal("5"))

rdflib/compare.py

@@ -73,6 +73,9 @@
     _:cb558f30e21ddfc05ca53108348338ade8
         <http://example.org/ns#label> "B" .
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 
 # TODO:
@@ -93,6 +96,8 @@
     import md5
     md = md5.new
 
+from .py3compat import text_type
+
 
 class IsomorphicGraph(ConjunctiveGraph):
     """
@@ -242,7 +247,7 @@ def _md5_hash(t):
         if isinstance(i, tuple):
             h.update(_md5_hash(i).encode('ascii'))
         else:
-            h.update(unicode(i).encode("utf8"))
+            h.update(text_type(i).encode("utf8"))
     return h.hexdigest()
 
 

rdflib/events.py

@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 __doc__ = """
 Dirt Simple Events
 
@@ -42,8 +46,7 @@ def __init__(self, **kw):
         self.__dict__.update(kw)
 
     def __repr__(self):
-        attrs = self.__dict__.keys()
-        attrs.sort()
+        attrs = sorted(self.__dict__.keys())
         return '<rdflib.events.Event %s>' % ([a for a in attrs],)
 
 

rdflib/extras/describer.py

@@ -1,8 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import with_statement
-from rdflib import py3compat
-__doc__ = py3compat.format_doctest_out("""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from ..py3compat import format_doctest_out
+__doc__ = format_doctest_out("""
 A Describer is a stateful utility for creating RDF statements in a
 semi-declarative manner. It has methods for creating literal values, rel and
 rev resource relations (somewhat resembling RDFa).
@@ -113,7 +116,6 @@
 from rdflib.term import Identifier
 from rdflib.term import Literal
 from rdflib.term import URIRef
-from rdflib.py3compat import format_doctest_out
 
 
 class Describer(object):

rdflib/extras/infixowl.py

@@ -1,8 +1,13 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from rdflib import py3compat
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
-__doc__ = py3compat.format_doctest_out("""
+from ..py3compat import PY3
+from ..py3compat import format_doctest_out
+
+__doc__ = format_doctest_out("""
 RDFLib Python binding for OWL Abstract Syntax
 
 see: http://www.w3.org/TR/owl-semantics/syntax.html
@@ -1366,7 +1371,7 @@ def __iadd__(self, other):
 
 
 class EnumeratedClass(OWLRDFListProxy, Class):
-    py3compat.format_doctest_out("""
+    format_doctest_out("""
     Class for owl:oneOf forms:
 
     OWL Abstract Syntax is used
@@ -1560,7 +1565,7 @@ def changeOperator(self, newOperator):
         ... except Exception%s: print(e)
         The new operator is already being used!
 
-        """ % 'as e' if py3compat.PY3 else ', e'
+        """ % 'as e' if PY3 else ', e'
         assert newOperator != self._operator, \
             "The new operator is already being used!"
         self.graph.remove((self.identifier, self._operator, self._rdfList.uri))
@@ -1654,7 +1659,7 @@ def __init__(self,
             self.graph.add((self.identifier, RDF.type, OWL_NS.Restriction))
             self.graph.remove((self.identifier, RDF.type, OWL_NS.Class))
 
-    @py3compat.format_doctest_out
+    @format_doctest_out
     def serialize(self, graph):
         """
         >>> g1 = Graph()

rdflib/graph.py

@@ -1,8 +1,12 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from rdflib.term import Literal  # required for doctests
 assert Literal # avoid warning
 from rdflib.namespace import Namespace  # required for doctests
 assert Namespace # avoid warning
-from rdflib.py3compat import format_doctest_out
+from .py3compat import format_doctest_out
 
 __doc__ = format_doctest_out("""\
 
@@ -238,16 +242,6 @@
 
 from hashlib import md5
 
-try:
-    from io import BytesIO
-    assert BytesIO
-except ImportError:
-    try:
-        from cStringIO import StringIO as BytesIO
-        assert BytesIO
-    except ImportError:
-        from StringIO import StringIO as BytesIO
-        assert BytesIO
 
 from rdflib.namespace import RDF, RDFS, SKOS
 
@@ -266,13 +260,14 @@
 from rdflib.parser import create_input_source
 from rdflib.namespace import NamespaceManager
 from rdflib.resource import Resource
-from rdflib import py3compat
-b = py3compat.b
 
 import os
 import shutil
 import tempfile
-from urlparse import urlparse
+
+from .py3compat import BytesIO
+from .py3compat import b
+from .py3compat import urlparse
 
 __all__ = [
     'Graph', 'ConjunctiveGraph', 'QuotedGraph', 'Seq',
@@ -384,8 +379,9 @@ def close(self, commit_pending_transaction=False):
         self.__store.close(
             commit_pending_transaction=commit_pending_transaction)
 
-    def add(self, (s, p, o)):
+    def add(self, triple):
         """Add a triple with self as context"""
+        s, p, o = triple
         assert isinstance(s, Node), \
             "Subject %s must be an rdflib term" % (s,)
         assert isinstance(p, Node), \
@@ -403,28 +399,29 @@ def addN(self, quads):
                           and _assertnode(s,p,o)
                           )
 
-    def remove(self, (s, p, o)):
+    def remove(self, triple):
         """Remove a triple from the graph
 
         If the triple does not provide a context attribute, removes the triple
         from all contexts.
         """
-        self.__store.remove((s, p, o), context=self)
+        self.__store.remove(triple, context=self)
 
-    def triples(self, (s, p, o)):
+    def triples(self, triple):
         """Generator over the triple store
 
         Returns triples that match the given triple pattern. If triple pattern
         does not provide a context, all contexts will be searched.
         """
+        s, p, o = triple
         if isinstance(p, Path):
             for _s, _o in p.eval(self, s, o):
                 yield (_s, p, _o)
         else:
             for (s, p, o), cg in self.__store.triples((s, p, o), context=self):
                 yield (s, p, o)
 
-    @py3compat.format_doctest_out
+    @format_doctest_out
     def __getitem__(self, item):
         """
         A graph can be "sliced" as a shortcut for the triples method
@@ -645,7 +642,8 @@ def predicate_objects(self, subject=None):
         for s, p, o in self.triples((subject, None, None)):
             yield p, o
 
-    def triples_choices(self, (subject, predicate, object_), context=None):
+    def triples_choices(self, triple, context=None):
+        subject, predicate, object_ = triple
         for (s, p, o), cg in self.store.triples_choices(
                 (subject, predicate, object_), context=self):
             yield (s, p, o)
@@ -681,13 +679,13 @@ def value(self, subject=None, predicate=RDF.value, object=None,
             values = self.predicates(subject, object)
 
         try:
-            retval = values.next()
+            retval = next(values)
         except StopIteration:
             retval = default
         else:
             if any is False:
                 try:
-                    values.next()
+                    next(values)
                     msg = ("While trying to find a value for (%s, %s, %s) the"
                            " following multiple values where found:\n" %
                            (subject, predicate, object))
@@ -710,7 +708,7 @@ def label(self, subject, default=''):
             return default
         return self.value(subject, RDFS.label, default=default, any=True)
 
-    @py3compat.format_doctest_out
+    @format_doctest_out
     def preferredLabel(self, subject, lang=None, default=None,
                        labelProperties=(SKOS.prefLabel, RDFS.label)):
         """
@@ -767,7 +765,7 @@ def preferredLabel(self, subject, lang=None, default=None,
             langfilter = lambda l: True
 
         for labelProp in labelProperties:
-            labels = filter(langfilter, self.objects(subject, labelProp))
+            labels = list(filter(langfilter, self.objects(subject, labelProp)))
             if len(labels) == 0:
                 continue
             else:
@@ -1382,9 +1380,9 @@ def quads(self, triple_or_quad=None):
             for ctx in cg:
                 yield s, p, o, ctx
 
-    def triples_choices(self, (s, p, o), context=None):
+    def triples_choices(self, triple, context=None):
         """Iterate over all the triples in the entire conjunctive graph"""
-
+        s, p, o = triple
         if context is None:
             if not self.default_union:
                 context=self.default_context
@@ -1643,8 +1641,9 @@ class QuotedGraph(Graph):
     def __init__(self, store, identifier):
         super(QuotedGraph, self).__init__(store, identifier)
 
-    def add(self, (s, p, o)):
+    def add(self, triple):
         """Add a triple with self as context"""
+        s, p, o = triple
         assert isinstance(s, Node), \
             "Subject %s must be an rdflib term" % (s,)
         assert isinstance(p, Node), \
@@ -1797,16 +1796,17 @@ def close(self):
         for graph in self.graphs:
             graph.close()
 
-    def add(self, (s, p, o)):
+    def add(self, triple):
         raise ModificationException()
 
     def addN(self, quads):
         raise ModificationException()
 
-    def remove(self, (s, p, o)):
+    def remove(self, triple):
         raise ModificationException()
 
-    def triples(self, (s, p, o)):
+    def triples(self, triple):
+        s, p, o = triple
         for graph in self.graphs:
             if isinstance(p, Path):
                 for s, o in p.eval(self, s, o):
@@ -1825,8 +1825,9 @@ def __contains__(self, triple_or_quad):
                     return True
         return False
 
-    def quads(self, (s, p, o)):
+    def quads(self, triple):
         """Iterate over all the quads in the entire aggregate graph"""
+        s, p, o = triple
         for graph in self.graphs:
             for s1, p1, o1 in graph.triples((s, p, o)):
                 yield (s1, p1, o1, graph)
@@ -1855,7 +1856,8 @@ def __isub__(self, other):
 
     # Conv. methods
 
-    def triples_choices(self, (subject, predicate, object_), context=None):
+    def triples_choices(self, triple, context=None):
+        subject, predicate, object_ = triple
         for graph in self.graphs:
             choices = graph.triples_choices((subject, predicate, object_))
             for (s, p, o) in choices: