# HG changeset patch # User cmlenz # Date 1165835615 0 # Node ID c66370dfc41bb5041c86f96381261bd2a01c227b # Parent e72bd8515dd235895e2700c51d8b91564d2421d5 Unit test fixes for Python 2.3. diff --git a/genshi/path.py b/genshi/path.py --- a/genshi/path.py +++ b/genshi/path.py @@ -156,8 +156,8 @@ >>> test = Path('child').test() >>> for event in xml: ... if test(event, {}, {}): - ... print event - ('START', (QName(u'child'), Attrs([(QName(u'id'), u'2')])), (None, 1, 34)) + ... print event[0], repr(event[1]) + START (QName(u'child'), Attrs([(QName(u'id'), u'2')])) """ paths = [(p, len(p), [0], [], [0] * len(p)) for p in [ (ignore_context and [_DOTSLASHSLASH] or []) + p for p in self.paths diff --git a/genshi/tests/builder.py b/genshi/tests/builder.py --- a/genshi/tests/builder.py +++ b/genshi/tests/builder.py @@ -45,11 +45,11 @@ def test_stream_as_child(self): xml = list(tag.span(XML('Foo')).generate()) self.assertEqual(5, len(xml)) - self.assertEqual((Stream.START, ('span', ()), (None, -1, -1)), xml[0]) - self.assertEqual((Stream.START, ('b', ()), (None, 1, 0)), xml[1]) - self.assertEqual((Stream.TEXT, 'Foo', (None, 1, 3)), xml[2]) - self.assertEqual((Stream.END, 'b', (None, 1, 6)), xml[3]) - self.assertEqual((Stream.END, 'span', (None, -1, -1)), xml[4]) + self.assertEqual((Stream.START, ('span', ())), xml[0][:2]) + self.assertEqual((Stream.START, ('b', ())), xml[1][:2]) + self.assertEqual((Stream.TEXT, 'Foo'), xml[2][:2]) + self.assertEqual((Stream.END, 'b'), xml[3][:2]) + self.assertEqual((Stream.END, 'span'), xml[4][:2]) def suite():