[py3k] Replace uses of 'unicode'

2 files changed, 7 insertions, 5 deletions

diff --git a/test/unittest_umessage.py b/test/unittest_umessage.py
index edd7633..531573c 100644
--- a/test/unittest_umessage.py
+++ b/test/unittest_umessage.py
@@ -20,6 +20,8 @@ import sys
 import email
 from os.path import join, dirname, abspath
 
+from six import text_type
+
 from logilab.common.testlib import TestCase, unittest_main
 from logilab.common.umessage import UMessage, decode_QP
 
@@ -40,22 +42,22 @@ class UMessageTC(TestCase):
 
     def test_get_subject(self):
         subj = self.umessage2.get('Subject')
-        self.assertEqual(type(subj), unicode)
+        self.assertEqual(type(subj), text_type)
         self.assertEqual(subj, u'À LA MER')
 
     def test_get_all(self):
         to = self.umessage2.get_all('To')
-        self.assertEqual(type(to[0]), unicode)
+        self.assertEqual(type(to[0]), text_type)
         self.assertEqual(to, [u'élément à accents <alf@logilab.fr>'])
 
     def test_get_payload_no_multi(self):
         payload = self.umessage1.get_payload()
-        self.assertEqual(type(payload), unicode)
+        self.assertEqual(type(payload), text_type)
 
     def test_decode_QP(self):
         test_line =  '=??b?UmFwaGHrbA==?= DUPONT<raphael.dupont@societe.fr>'
         test = decode_QP(test_line)
-        self.assertEqual(type(test), unicode)
+        self.assertEqual(type(test), text_type)
         self.assertEqual(test, u'Raphaël DUPONT<raphael.dupont@societe.fr>')
 
 
diff --git a/umessage.py b/umessage.py
index d0044fd..a5e4799 100644
--- a/umessage.py
+++ b/umessage.py
@@ -44,7 +44,7 @@ def decode_QP(string):
     for decoded, charset in decode_header(string):
         if not charset :
             charset = 'iso-8859-15'
-        parts.append(unicode(decoded, charset, 'replace'))
+        parts.append(decoded.decode(charset, 'replace'))
 
     if sys.version_info < (3, 3):
         # decoding was non-RFC compliant wrt to whitespace handling