Replace unicode() with six.text_type()

src/z3c/rml/attr.py

@@ -77,7 +77,7 @@ def fromUnicode(self, ustr):
         """See zope.schema.interfaces.IField"""
         if self.context is None:
             raise ValueError('Attribute not bound to a context.')
-        return super(RMLAttribute, self).fromUnicode(unicode(ustr))
+        return super(RMLAttribute, self).fromUnicode(six.text_type(ustr))
 
     def get(self):
         """See zope.schema.interfaces.IField"""
@@ -533,7 +533,7 @@ class TextNode(RMLAttribute):
     def get(self):
         if self.context.element.text is None:
             return u''
-        return unicode(self.context.element.text).strip()
+        return six.text_type(self.context.element.text).strip()
 
 
 class FirstLevelTextNode(TextNode):

src/z3c/rml/rml2pdf.py

@@ -24,7 +24,7 @@
 
 
 def parseString(xml, removeEncodingLine=True, filename=None):
-    if isinstance(xml, unicode) and removeEncodingLine:
+    if isinstance(xml, six.text_type) and removeEncodingLine:
         # RML is a unicode string, but oftentimes documents declare their
         # encoding using <?xml ...>. Unfortuantely, I cannot tell lxml to
         # ignore that directive. Thus we remove it.

src/z3c/rml/special.py

@@ -13,6 +13,7 @@
 ##############################################################################
 """Special Element Processing
 """
+import six
 from z3c.rml import attr, directive, interfaces
 
 
@@ -68,7 +69,7 @@ def _getManager(self):
             return  attr.getManager(self)
 
     def getPageNumber(self, elem, canvas):
-        return unicode(
+        return six.text_type(
             canvas.getPageNumber() + int(elem.get('countingFrom', 1)) - 1
         )
 
@@ -111,4 +112,4 @@ def _getText(self, node, canvas, include_final_tail=True):
 
 def do_eval(value):
     # Maybe still not safe
-    return unicode(eval(value.strip(), {'__builtins__': None}, {}))
+    return six.text_type(eval(value.strip(), {'__builtins__': None}, {}))