From 19f5ae6a46b0d0ba50da70b8cfdd1377161bcb5a Mon Sep 17 00:00:00 2001 From: jevans Date: Mon, 5 Aug 2013 20:39:39 -0400 Subject: [PATCH] pylint work regarding rstrip arguments. closes #98 --- glymur/jp2box.py | 4 ++-- glymur/test/fixtures.py | 2 +- glymur/test/test_jp2k.py | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/glymur/jp2box.py b/glymur/jp2box.py index 149af0a..5bbe733 100644 --- a/glymur/jp2box.py +++ b/glymur/jp2box.py @@ -1792,14 +1792,14 @@ class XMLBox(Jp2kBox): text = read_buffer.decode('utf-8') # Strip out any trailing nulls, as they can foul up XML parsing. - text = text.rstrip('\0') + text = text.rstrip(chr(0)) try: elt = ET.fromstring(text) xml = ET.ElementTree(elt) except ParseError as parse_error: msg = 'A problem was encountered while parsing an XML box:' - msg += '\n\n\t"{0}"\n\nNo XML was retrieved.' + msg += '\n\n\t"{0}"\n\nNo XML was retrieved.' msg = msg.format(str(parse_error)) warnings.warn(msg, UserWarning) xml = None diff --git a/glymur/test/fixtures.py b/glymur/test/fixtures.py index 39b4ac5..cbfbc3b 100644 --- a/glymur/test/fixtures.py +++ b/glymur/test/fixtures.py @@ -57,7 +57,7 @@ def read_pgx(pgx_file): header += chr(char[0]) header = header.rstrip() - tokens = re.split('\s', header) + tokens = re.split(r'\s', header) if (tokens[1][0] == 'M') and (sys.byteorder == 'little'): swapbytes = True diff --git a/glymur/test/test_jp2k.py b/glymur/test/test_jp2k.py index f0db4b7..6e1e7a0 100644 --- a/glymur/test/test_jp2k.py +++ b/glymur/test/test_jp2k.py @@ -7,6 +7,7 @@ import struct import sys import tempfile import uuid +from xml.etree import cElementTree as ET if sys.hexversion < 0x02070000: import unittest2 as unittest @@ -623,6 +624,8 @@ class TestJp2k(unittest.TestCase): self.assertEqual(jp2k.box[3].box_id, 'xml ') self.assertEqual(jp2k.box[3].offset, 77) self.assertEqual(jp2k.box[3].length, 36) + self.assertEqual(ET.tostring(jp2k.box[3].xml.getroot()), + b'this is a test') @unittest.skipIf(os.name == "nt", "NamedTemporaryFile issue on windows") def test_asoc_label_box(self):