From 1484fd974f0dc31cd9b7fe9abe5318be8e95748e Mon Sep 17 00:00:00 2001 From: John Evans Date: Mon, 10 Feb 2014 15:43:18 -0500 Subject: [PATCH] Removed trailing newline from XML string output. #160 --- glymur/jp2box.py | 4 +++- glymur/test/fixtures.py | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/glymur/jp2box.py b/glymur/jp2box.py index 53bad9f..07ddb6e 100644 --- a/glymur/jp2box.py +++ b/glymur/jp2box.py @@ -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: diff --git a/glymur/test/fixtures.py b/glymur/test/fixtures.py index 0d5069b..5f7d77a 100644 --- a/glymur/test/fixtures.py +++ b/glymur/test/fixtures.py @@ -455,7 +455,6 @@ UUID Box (uuid) @ (77, 3146) - Contiguous Codestream Box (jp2c) @ (3223, 1132296) Main header: SOC marker segment @ (3231, 0) @@ -660,7 +659,6 @@ UUID Box (uuid) @ (77, 3146) - Contiguous Codestream Box (jp2c) @ (3223, 1132296)""" nemo_dump_no_codestream_no_xml = r"""JPEG 2000 Signature Box (jP ) @ (0, 12)