Merge pull request #1149 from ashleysommer/t0b3_github

Remove all remnants of Python2 compatibility

5 files changed, 25 insertions, 35 deletions

diff --git a/rdflib/tools/csv2rdf.py b/rdflib/tools/csv2rdf.py
index 64b7c6eb..eed77298 100644
--- a/rdflib/tools/csv2rdf.py
+++ b/rdflib/tools/csv2rdf.py
@@ -5,8 +5,6 @@ try: ``csv2rdf --help``
 
 """
 
-from __future__ import print_function
-
 import sys
 import re
 import csv
@@ -102,7 +100,7 @@ def toProperty(label):
     firstNm => firstNm
 
     """
-    label = re.sub("[^\w]", " ", label)
+    label = re.sub("[^\\w]", " ", label)
     label = re.sub("([a-z])([A-Z])", "\\1 \\2", label)
     label = label.split(" ")
     return "".join([label[0].lower()] + [x.capitalize() for x in label[1:]])
diff --git a/rdflib/tools/graphisomorphism.py b/rdflib/tools/graphisomorphism.py
index a073d7d9..fbb31c0e 100644
--- a/rdflib/tools/graphisomorphism.py
+++ b/rdflib/tools/graphisomorphism.py
@@ -3,8 +3,6 @@ A commandline tool for testing if RDF graphs are isomorpic, i.e. equal
 if BNode labels are ignored.
 """
 
-from __future__ import absolute_import
-
 from rdflib import Graph
 from rdflib import BNode
 from itertools import combinations
diff --git a/rdflib/tools/rdf2dot.py b/rdflib/tools/rdf2dot.py
index 9b622b66..84e3d359 100644
--- a/rdflib/tools/rdf2dot.py
+++ b/rdflib/tools/rdf2dot.py
@@ -9,8 +9,6 @@ You can draw the graph of an RDF file directly:
 
 """
 
-from __future__ import absolute_import
-
 import rdflib
 import rdflib.extras.cmdlineutils
 
@@ -110,10 +108,10 @@ def rdf2dot(g, stream, opts={}):
     def formatliteral(l, g):
         v = cgi.escape(l)
         if l.datatype:
-            return u""%s"^^%s" % (v, qname(l.datatype, g))
+            return ""%s"^^%s" % (v, qname(l.datatype, g))
         elif l.language:
-            return u""%s"@%s" % (v, l.language)
-        return u""%s"" % v
+            return ""%s"@%s" % (v, l.language)
+        return ""%s"" % v
 
     def qname(x, g):
         try:
@@ -125,7 +123,7 @@ def rdf2dot(g, stream, opts={}):
     def color(p):
         return "BLACK"
 
-    stream.write(u'digraph { \n node [ fontname="DejaVu Sans" ] ; \n')
+    stream.write('digraph { \n node [ fontname="DejaVu Sans" ] ; \n')
 
     for s, p, o in g:
         sn = node(s)
@@ -134,28 +132,28 @@ def rdf2dot(g, stream, opts={}):
         if isinstance(o, (rdflib.URIRef, rdflib.BNode)):
             on = node(o)
             opstr = (
-                u"\t%s -> %s [ color=%s, label=< <font point-size='10' "
-                + u"color='#336633'>%s</font> > ] ;\n"
+                "\t%s -> %s [ color=%s, label=< <font point-size='10' "
+                + "color='#336633'>%s</font> > ] ;\n"
             )
             stream.write(opstr % (sn, on, color(p), qname(p, g)))
         else:
             fields[sn].add((qname(p, g), formatliteral(o, g)))
 
     for u, n in nodes.items():
-        stream.write(u"# %s %s\n" % (u, n))
+        stream.write("# %s %s\n" % (u, n))
         f = [
-            u"<tr><td align='left'>%s</td><td align='left'>%s</td></tr>" % x
+            "<tr><td align='left'>%s</td><td align='left'>%s</td></tr>" % x
             for x in sorted(fields[n])
         ]
         opstr = (
-            u"%s [ shape=none, color=%s label=< <table color='#666666'"
-            + u" cellborder='0' cellspacing='0' border='1'><tr>"
-            + u"<td colspan='2' bgcolor='grey'><B>%s</B></td></tr><tr>"
-            + u"<td href='%s' bgcolor='#eeeeee' colspan='2'>"
-            + u"<font point-size='10' color='#6666ff'>%s</font></td>"
-            + u"</tr>%s</table> > ] \n"
+            "%s [ shape=none, color=%s label=< <table color='#666666'"
+            + " cellborder='0' cellspacing='0' border='1'><tr>"
+            + "<td colspan='2' bgcolor='grey'><B>%s</B></td></tr><tr>"
+            + "<td href='%s' bgcolor='#eeeeee' colspan='2'>"
+            + "<font point-size='10' color='#6666ff'>%s</font></td>"
+            + "</tr>%s</table> > ] \n"
         )
-        stream.write(opstr % (n, NODECOLOR, label(u, g), u, u, u"".join(f)))
+        stream.write(opstr % (n, NODECOLOR, label(u, g), u, u, "".join(f)))
 
     stream.write("}\n")
 
diff --git a/rdflib/tools/rdfpipe.py b/rdflib/tools/rdfpipe.py
index 6ec9e6c2..d0673f72 100644
--- a/rdflib/tools/rdfpipe.py
+++ b/rdflib/tools/rdfpipe.py
@@ -5,8 +5,6 @@ A commandline tool for parsing RDF in different formats and serializing the
 resulting graph to a chosen format.
 """
 
-from __future__ import absolute_import
-
 import sys
 from optparse import OptionParser
 import logging
diff --git a/rdflib/tools/rdfs2dot.py b/rdflib/tools/rdfs2dot.py
index e8cf5813..cb8d0bfd 100644
--- a/rdflib/tools/rdfs2dot.py
+++ b/rdflib/tools/rdfs2dot.py
@@ -9,8 +9,6 @@ You can draw the graph of an RDFS file directly:
    rdf2dot my_rdfs_file.rdf | dot -Tpng | display
 """
 
-from __future__ import absolute_import
-
 import rdflib.extras.cmdlineutils
 
 import sys
@@ -98,7 +96,7 @@ def rdfs2dot(g, stream, opts={}):
                 pass  # bnodes and some weird URIs cannot be split
         return l_
 
-    stream.write(u'digraph { \n node [ fontname="DejaVu Sans" ] ; \n')
+    stream.write('digraph { \n node [ fontname="DejaVu Sans" ] ; \n')
 
     for x in g.subjects(RDF.type, RDFS.Class):
         n = node(x)
@@ -106,7 +104,7 @@ def rdfs2dot(g, stream, opts={}):
     for x, y in g.subject_objects(RDFS.subClassOf):
         x = node(x)
         y = node(y)
-        stream.write(u"\t%s -> %s [ color=%s ] ;\n" % (y, x, ISACOLOR))
+        stream.write("\t%s -> %s [ color=%s ] ;\n" % (y, x, ISACOLOR))
 
     for x in g.subjects(RDF.type, RDF.Property):
         for a, b in itertools.product(
@@ -125,18 +123,18 @@ def rdfs2dot(g, stream, opts={}):
                 )
 
     for u, n in nodes.items():
-        stream.write(u"# %s %s\n" % (u, n))
+        stream.write("# %s %s\n" % (u, n))
         f = [
-            u"<tr><td align='left'>%s</td><td>%s</td></tr>" % x
+            "<tr><td align='left'>%s</td><td>%s</td></tr>" % x
             for x in sorted(fields[n])
         ]
         opstr = (
-            u"%s [ shape=none, color=%s label=< <table color='#666666'"
-            + u' cellborder="0" cellspacing=\'0\' border="1"><tr>'
-            + u"<td colspan=\"2\" bgcolor='grey'><B>%s</B></td>"
-            + u"</tr>%s</table> > ] \n"
+            "%s [ shape=none, color=%s label=< <table color='#666666'"
+            + " cellborder='0' cellspacing='0' border='1'><tr>"
+            + "<td colspan='2' bgcolor='grey'><B>%s</B></td>"
+            + "</tr>%s</table> > ] \n"
         )
-        stream.write(opstr % (n, NODECOLOR, label(u, g), u"".join(f)))
+        stream.write(opstr % (n, NODECOLOR, label(u, g), "".join(f)))
 
     stream.write("}\n")