# HG changeset patch # User Sebastien Jodogne # Date 1712081469 -7200 # Node ID d5e355d9797c471f0b33e97c0fb8c17ac784f57c # Parent 1e76331675a17c6d5e8d7db0199e0efed3dd4f6e test of worklists now working with Python 2 diff -r 1e76331675a1 -r d5e355d9797c Plugins/Worklists/Run.py --- a/Plugins/Worklists/Run.py Tue Apr 02 19:54:53 2024 +0200 +++ b/Plugins/Worklists/Run.py Tue Apr 02 20:11:09 2024 +0200 @@ -325,12 +325,15 @@ self.assertEqual(2, len(result[0])) tags = ParseTopLevelTags(result[0]) self.assertEqual(expectedEncoding, tags['0008,0005'].decode('ascii')) - self.assertEqual(expectedContent, tags['0010,0010'].decode(pythonEncoding)) + if sys.version_info >= (3, 0): + self.assertEqual(expectedContent, tags['0010,0010'].decode(pythonEncoding)) + else: + self.assertEqual(expectedContent.decode('utf-8'), tags['0010,0010'].decode(pythonEncoding)) AddToDatabase('Encodings/issue49-latin1.wl') - Check('ascii', 'Ascii', 'ISO_IR 6', r'VANILL^LAURA^^^Mme') - Check('utf-8', 'Utf8', 'ISO_IR 192', r'VANILLÉ^LAURA^^^Mme') - Check('latin-1', 'Latin1', 'ISO_IR 100', r'VANILLÉ^LAURA^^^Mme') + Check('ascii', 'Ascii', 'ISO_IR 6', 'VANILL^LAURA^^^Mme') + Check('utf-8', 'Utf8', 'ISO_IR 192', 'VANILLÉ^LAURA^^^Mme') + Check('latin-1', 'Latin1', 'ISO_IR 100', 'VANILLÉ^LAURA^^^Mme') def test_format(self):