dabo Commit
Revision 6558
Date: 2011-04-14 22:16:03 -0700 (Thu, 14 Apr 2011)
Author: Paul
Trac: http://trac.dabodev.com/changeset/6558
Changed:
U trunk/dabo/lib/reportWriter.py
Log:
Fixed a bug introduced with my recent changes that would raise an exception
with Frameset/Paragraph.
Diff:
Modified: trunk/dabo/lib/reportWriter.py
===================================================================
--- trunk/dabo/lib/reportWriter.py 2011-04-15 04:57:01 UTC (rev 6557)
+++ trunk/dabo/lib/reportWriter.py 2011-04-15 05:16:03 UTC (rev 6558)
@@ -1710,12 +1710,10 @@
if isinstance(obj, Memo):
# Memo doesn't have any subobjects
objects = [obj]
- style = "Normal"
else:
# Frameset/Paragraph is deprecated
objects = obj["Objects"]
- style = fobject.getProp("style")
- s = styles.getSampleStyleSheet()[style]
+ s = styles.getSampleStyleSheet()["Normal"]
story = []
for fobject in objects:
@@ -1725,7 +1723,7 @@
if isinstance(s, basestring):
expr = expr.encode(self.Encoding)
else:
- expr = unicode(expr)
+ expr = ustr(expr)
s = copy.deepcopy(s)
s.fontSize = fobject.getProp("fontSize")
_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev
Searchable Archives: http://leafe.com/archives/search/dabo-dev
This message:
http://leafe.com/archives/byMID/[email protected]
