More fixes for Python 3 compatibility.

Author: takluyver

rdflib/graph.py

@@ -145,9 +145,12 @@
     from md5 import md5    
 
 try:
-    from cStringIO import StringIO
+    from io import BytesIO
 except ImportError:
-    from StringIO import StringIO
+    try:
+        from cStringIO import StringIO as BytesIO
+    except ImportError:
+        from StringIO import StringIO as BytesIO
 
 # # Can't use this approach any longer, this function will raise an ImportError
 # # because the sparql module has been moved to the RDFExtras package.
@@ -742,7 +745,7 @@ def serialize(
         """
         serializer = plugin.get(format, Serializer)(self)
         if destination is None:
-            stream = StringIO()
+            stream = BytesIO()
             serializer.serialize(stream, base=base, encoding=encoding, **args)
             return stream.getvalue()
         if hasattr(destination, "write"):

rdflib/plugins/parsers/notation3.py

@@ -902,22 +902,22 @@ def feed(self, octets):
         parser, it should be straightforward to recover."""
 
         if not isinstance(octets, unicode):        
-           str = octets.decode('utf-8')
+           s = octets.decode('utf-8')
            # NB already decoded, so \ufeff
-           if len(str) > 0 and str[0] == codecs.BOM_UTF8.decode('utf-8'):
-               str = str[1:]
+           if len(s) > 0 and s[0] == codecs.BOM_UTF8.decode('utf-8'):
+               s = s[1:]
         else: 
-           str=octets
+           s=octets
 
         i = 0
         while i >= 0:
-            j = self.skipSpace(str, i)
+            j = self.skipSpace(s, i)
             if j<0: return
 
-            i = self.directiveOrStatement(str,j)
+            i = self.directiveOrStatement(s,j)
             if i<0:
-                print "# next char: ", `str[j]` 
-                raise BadSyntax(self._thisDoc, self.lines, str, j,
+                print "# next char: ", `s[j]` 
+                raise BadSyntax(self._thisDoc, self.lines, s, j,
                                     "expected directive or statement")
 
     def directiveOrStatement(self, str,h):

rdflib/plugins/parsers/rdfxml.py

@@ -249,7 +249,8 @@ def convert(self, name, qname, attrs):
 
     def document_element_start(self, name, qname, attrs):
         if name[0] and URIRef("".join(name)) == RDF.RDF:
-            next = self.next
+            # Cheap hack so 2to3 doesn't turn it into __next__
+            next = getattr(self, 'next')
             next.start = self.node_element_start
             next.end = self.node_element_end
         else:
@@ -263,7 +264,9 @@ def node_element_start(self, name, qname, attrs):
         name, atts = self.convert(name, qname, attrs)
         current = self.current
         absolutize = self.absolutize
-        next = self.next
+        
+        # Cheap hack so 2to3 doesn't turn it into __next__
+        next = getattr(self, 'next')
         next.start = self.property_element_start
         next.end = self.property_element_end
 
@@ -339,7 +342,9 @@ def property_element_start(self, name, qname, attrs):
         name, atts = self.convert(name, qname, attrs)
         current = self.current
         absolutize = self.absolutize
-        next = self.next
+        
+        # Cheap hack so 2to3 doesn't turn it into __next__
+        next = getattr(self, 'next')
         object = None
         current.data = None
         current.list = None

rdflib/plugins/serializers/turtle.py

@@ -181,7 +181,7 @@ def serialize(self, stream, base=None, encoding=None, spacious=None, **args):
                 self.write('\n')
 
         self.endDocument()
-        stream.write("\n")
+        stream.write(u"\n".encode('ascii'))
 
     def preprocessTriple(self, triple):
         super(TurtleSerializer, self).preprocessTriple(triple)

test/test_graph.py

@@ -350,7 +350,7 @@ def do_GET(self):
 
         self.send_header("Content-type",rct)
         self.end_headers()
-        self.wfile.write(content)
+        self.wfile.write(content.encode('utf-8'))
 
     def log_message(self, *args): 
         pass