diff options
author | t0b3 <thomas.bettler@gmail.com> | 2020-05-08 19:54:27 +0200 |
---|---|---|
committer | t0b3 <thomas.bettler@gmail.com> | 2020-06-22 20:34:26 +0200 |
commit | f69df4252e3a8466c025e34585dac37c7691b47c (patch) | |
tree | a8b9546b5e895d9d6d011f39e804d09921f50681 /rdflib/tools | |
parent | 228a8db9b6871f069167b9075eabe9c7027cba0e (diff) | |
download | rdflib-f69df4252e3a8466c025e34585dac37c7691b47c.tar.gz |
2to3 whole sourcebase
Signed-off-by: t0b3 <thomas.bettler@gmail.com>
Diffstat (limited to 'rdflib/tools')
-rw-r--r-- | rdflib/tools/csv2rdf.py | 4 | ||||
-rw-r--r-- | rdflib/tools/graphisomorphism.py | 2 | ||||
-rw-r--r-- | rdflib/tools/rdf2dot.py | 32 | ||||
-rw-r--r-- | rdflib/tools/rdfpipe.py | 2 | ||||
-rw-r--r-- | rdflib/tools/rdfs2dot.py | 20 |
5 files changed, 25 insertions, 35 deletions
diff --git a/rdflib/tools/csv2rdf.py b/rdflib/tools/csv2rdf.py index 812ffadc..664f262e 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 @@ -346,7 +344,7 @@ class CSV2RDF(object): next(csvreader) # read header line - header_labels = list(csvreader.next()) + header_labels = list(next(csvreader)) headers = dict(enumerate([self.PROPBASE[toProperty(x)] for x in header_labels])) # override header properties if some are given for k, v in self.PROPS.items(): 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..5ed059c9 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") |