Removing usages of rdflib.py3compat (#36)

Author: mwatts15

rdflib_sqlalchemy/termutils.py

@@ -1,7 +1,6 @@
 """Convenience functions for working with Terms and Graphs."""
 from rdflib import BNode, Graph, Literal, URIRef, Variable
 from rdflib.graph import QuotedGraph
-from rdflib.py3compat import format_doctest_out
 from rdflib.term import Statement
 
 from rdflib_sqlalchemy.constants import (
@@ -25,7 +24,6 @@
 }
 
 
-@format_doctest_out
 def normalize_graph(graph):
     """
     Take an instance of a ``Graph`` and return the instance's identifier and  ``type``.
@@ -42,13 +40,13 @@ def normalize_graph(graph):
     >>> memstore = plugin.get('IOMemory', Store)()
     >>> g = Graph(memstore, URIRef("http://purl.org/net/bel-epa/gjh"))
     >>> normalize_graph(g)
-    (rdflib.term.URIRef(%(u)s'http://purl.org/net/bel-epa/gjh'), 'U')
+    (rdflib.term.URIRef(u'http://purl.org/net/bel-epa/gjh'), 'U')
     >>> g = ConjunctiveGraph(memstore, Namespace("http://rdflib.net/ns"))
     >>> normalize_graph(g)  #doctest: +ELLIPSIS
-    (rdflib.term.URIRef(%(u)s'http://rdflib.net/ns'), 'U')
+    (rdflib.term.URIRef(u'http://rdflib.net/ns'), 'U')
     >>> g = QuotedGraph(memstore, Namespace("http://rdflib.net/ns"))
     >>> normalize_graph(g)
-    (rdflib.term.URIRef(%(u)s'http://rdflib.net/ns'), 'F')
+    (rdflib.term.URIRef(u'http://rdflib.net/ns'), 'F')
 
     """
     if isinstance(graph, QuotedGraph):
@@ -57,7 +55,6 @@ def normalize_graph(graph):
         return graph.identifier, term_to_letter(graph.identifier)
 
 
-@format_doctest_out
 def term_to_letter(term):
     """
     Relate a given term to one of several key types.
@@ -79,9 +76,9 @@ def term_to_letter(term):
     'U'
     >>> term_to_letter(BNode())
     'B'
-    >>> term_to_letter(Literal(%(u)s''))  # noqa
+    >>> term_to_letter(Literal(u''))  # noqa
     'L'
-    >>> term_to_letter(Variable(%(u)s'x'))  # noqa
+    >>> term_to_letter(Variable(u'x'))  # noqa
     'V'
     >>> term_to_letter(Graph())
     'B'

test/graph_case.py

@@ -3,7 +3,7 @@
 
 from rdflib import Graph, URIRef, Literal, plugin, RDF
 from rdflib.parser import StringInputSource
-from rdflib.py3compat import PY3
+from six import PY3
 from rdflib.store import Store
 
 

test/test_sqlalchemy_mysql.py

@@ -5,7 +5,7 @@
 from nose import SkipTest
 from rdflib import Literal
 from rdflib.graph import ConjunctiveGraph as Graph
-from rdflib.py3compat import PY3
+from six import PY3
 from rdflib.store import NO_STORE, VALID_STORE
 from rdflib.term import URIRef