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

Merge branch 'issue131' into devel

Browse source
This commit is contained in:
John Evans 2013-10-13 12:03:05 -04:00
commit 6c21e738b5
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
glymur/test/test_printing.py
View file

@ -747,8 +747,12 @@ class TestPrinting(unittest.TestCase):
with patch('sys.stdout', new=StringIO()) as fake_out: with patch('sys.stdout', new=StringIO()) as fake_out:
print(xmlbox) print(xmlbox)
actual = fake_out.getvalue().strip() actual = fake_out.getvalue().strip()
lines = ["XML Box (xml ) @ (-1, 0)", if sys.hexversion < 0x03000000:
" <flow>Strömung</flow>"] lines = ["XML Box (xml ) @ (-1, 0)",
" <flow>Str\xc3\xb6mung</flow>"]
else:
lines = ["XML Box (xml ) @ (-1, 0)",
" <flow>Strömung</flow>"]
expected = '\n'.join(lines) expected = '\n'.join(lines)
self.assertEqual(actual, expected) self.assertEqual(actual, expected)
@ -767,8 +771,13 @@ class TestPrinting(unittest.TestCase):
with patch('sys.stdout', new=StringIO()) as fake_out: with patch('sys.stdout', new=StringIO()) as fake_out:
print(xmlbox) print(xmlbox)
actual = fake_out.getvalue().strip() actual = fake_out.getvalue().strip()
lines = ["XML Box (xml ) @ (-1, 0)", if sys.hexversion < 0x03000000:
" <country>Россия</country>"] lines = ["XML Box (xml ) @ (-1, 0)",
" <country>\xd0\xa0\xd0\xbe\xd1\x81\xd1\x81\xd0\xb8\xd1\x8f</country>"]
else:
lines = ["XML Box (xml ) @ (-1, 0)",
" <country>Россия</country>"]
expected = '\n'.join(lines) expected = '\n'.join(lines)
self.assertEqual(actual, expected) self.assertEqual(actual, expected)