doctemplate.py: allow unicode fram index names py33
authorrobin
Wed, 05 Feb 2014 15:42:45 +0000
branchpy33
changeset 4020 13ff3d55b5c2
parent 4019 dcbcae8fbb8f
child 4021 b645207037d9
doctemplate.py: allow unicode fram index names
src/reportlab/platypus/doctemplate.py
--- a/src/reportlab/platypus/doctemplate.py	Wed Feb 05 14:36:03 2014 +0000
+++ b/src/reportlab/platypus/doctemplate.py	Wed Feb 05 15:42:45 2014 +0000
@@ -670,7 +670,7 @@
 
     def handle_nextFrame(self,fx,resume=0):
         '''On endFrame change to the frame with name or index fx'''
-        if isinstance(fx,str):
+        if isinstance(fx,strTypes):
             for f in self.pageTemplate.frames:
                 if f.id == fx:
                     self._nextFrameIndex = self.pageTemplate.frames.index(f)
@@ -1030,7 +1030,7 @@
 
     _allowedLifetimes = 'page','frame','build','forever'
     def docAssign(self,var,expr,lifetime):
-        if not isinstance(expr,str): expr=str(expr)
+        if not isinstance(expr,strTypes): expr=str(expr)
         expr=expr.strip()
         var=var.strip()
         self.docExec('%s=(%s)'%(var.strip(),expr.strip()),lifetime)