rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Management of floats with a given precision; XmlMarshaller can dump unicode or str result.

Browse source
This commit is contained in:
Gaetan Delannay 2010-01-29 11:28:39 +01:00
parent 3bb907ca5d
commit 2e1c6a6999
5 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
shared/xml_parser.py
View file

@ -336,16 +336,22 @@ class XmlMarshaller:
fieldsToExclude = []
atFiles = ('image', 'file') # Types of archetypes fields that contain files.
def __init__(self, cdata=False):
def __init__(self, cdata=False, dumpUnicode=False):
'''If p_cdata is True, all string values will be dumped as XML CDATA.'''
self.cdata = cdata
self.dumpUnicode = dumpUnicode
def dumpString(self, res, s):
'''Dumps a string into the result.'''
if self.cdata: res.write('<![CDATA[')
if hasattr(self, 'cdata') and self.cdata: res.write('<![CDATA[')
# Try to solve encoding problems
try:
s = s.decode('utf-8')
if hasattr(self, 'dumpUnicode') and self.dumpUnicode:
# Produce a unicode
s = s.decode('utf-8')
else:
# Produce a str
s = s.decode('utf-8').encode('utf-8')
except UnicodeEncodeError:
pass
# Replace special chars by XML entities
@ -354,10 +360,11 @@ class XmlMarshaller:
res.write(self.xmlEntities[c])
else:
res.write(c)
if self.cdata: res.write(']]>')
if hasattr(self, 'cdata') and self.cdata: res.write(']]>')
def dumpFile(self, res, v):
'''Dumps a file into the result.'''
if not v: return
# p_value contains the (possibly binary) content of a file. We will
# encode it in Base64, in one or several parts.
res.write('<part type="base64" number="1">')