jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed trailing newline from XML string output. #160

Browse source
This commit is contained in:
John Evans 2014-02-10 15:43:18 -05:00
commit 1484fd974f
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glymur/jp2box.py
View file

@ -2761,7 +2761,9 @@ class UUIDBox(Jp2kBox):
if self.uuid == uuid.UUID('be7acfcb-97a9-42e8-9c71-999491e3afac'):
line = '\n UUID Data: {0}'
msg += line.format(_pretty_print_xml(self.data))
xmlstring = _pretty_print_xml(self.data)
xmlstring = xmlstring.rstrip()
msg += line.format(xmlstring)
elif self.uuid.bytes == b'JpgTiffExif->JP2':
msg += '\n UUID Data: {0}'.format(str(self.data))
else:

2
glymur/test/fixtures.py
View file

@ -455,7 +455,6 @@ UUID Box (uuid) @ (77, 3146)
</rdf:Description>
</rdf:RDF>
</ns0:xmpmeta>
Contiguous Codestream Box (jp2c) @ (3223, 1132296)
Main header:
SOC marker segment @ (3231, 0)
@ -660,7 +659,6 @@ UUID Box (uuid) @ (77, 3146)
</rdf:Description>
</rdf:RDF>
</ns0:xmpmeta>
Contiguous Codestream Box (jp2c) @ (3223, 1132296)"""
nemo_dump_no_codestream_no_xml = r"""JPEG 2000 Signature Box (jP ) @ (0, 12)