Reinstated patch to fix locale/utf8 in test, py3 specific, cited and tested in Bug #454402

1 files changed, 27 insertions, 0 deletions

diff --git a/dev-python/logilab-common/files/logilab-common-0.59.0-utf8-test.patch b/dev-python/logilab-common/files/logilab-common-0.59.0-utf8-test.patch
new file mode 100644
index 000000000000..0896e1fa0b0c
--- /dev/null
+++ b/dev-python/logilab-common/files/logilab-common-0.59.0-utf8-test.patch
@@ -0,0 +1,27 @@
+diff -ur logilab-common-0.59.0.orig/test/unittest_umessage.py logilab-common-0.59.0/test/unittest_umessage.py
+--- test/unittest_umessage.py	2013-01-24 01:42:03.000000000 +0800
++++ test/unittest_umessage.py	2013-02-10 00:53:58.431767641 +0800
+@@ -21,15 +21,20 @@
+ 
+ from logilab.common.testlib import TestCase, unittest_main
+ from logilab.common.umessage import UMessage, decode_QP
++import sys, io
+ 
+ DATA = join(dirname(abspath(__file__)), 'data')
+ 
+ class UMessageTC(TestCase):
+ 
+     def setUp(self):
+-        msg1 = email.message_from_file(open(join(DATA, 'test1.msg')))
+-        self.umessage1 = UMessage(msg1)
+-        msg2 = email.message_from_file(open(join(DATA, 'test2.msg')))
++        if sys.version_info >= (3, 2):
++            msg1 = email.message_from_file(io.open(join(DATA, 'test1.msg'), encoding='utf8'))
++            msg2 = email.message_from_file(io.open(join(DATA, 'test2.msg'), encoding='utf8'))
++        else:
++            msg1 = email.message_from_file(open(join(DATA, 'test1.msg')))
++            msg2 = email.message_from_file(open(join(DATA, 'test2.msg')))
++        self.umessage1 = UMessage(msg1)
+         self.umessage2 = UMessage(msg2)
+ 
+     def test_get_subject(self):