diff --git a/imbox/utils.py b/imbox/utils.py index d3ef304..251f56c 100644 --- a/imbox/utils.py +++ b/imbox/utils.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals from six import PY3 if PY3: @@ -7,7 +8,7 @@ if PY3: def str_decode(value='', encoding=None, errors='strict'): return bytes(value, encoding, errors).decode('utf-8') else: - def str_encode(string=u'', encoding=None, errors='strict'): + def str_encode(string='', encoding=None, errors='strict'): return unicode(string, encoding, errors) def str_decode(value='', encoding=None, errors='strict'): diff --git a/tests/parser_tests.py b/tests/parser_tests.py index 996e2a9..3acf982 100644 --- a/tests/parser_tests.py +++ b/tests/parser_tests.py @@ -1,3 +1,4 @@ +from __future__ import unicode_literals import unittest from imbox.parser import * @@ -41,9 +42,9 @@ class TestParser(unittest.TestCase): parsed_email = parse_email(raw_email) self.assertEqual(raw_email, parsed_email.raw_email) - self.assertEqual(u'Test email - no attachment', parsed_email.subject) - self.assertEqual(u'Tue, 30 Jul 2013 15:56:29 +0300', parsed_email.date) - self.assertEqual(u'', parsed_email.message_id) + self.assertEqual('Test email - no attachment', parsed_email.subject) + self.assertEqual('Tue, 30 Jul 2013 15:56:29 +0300', parsed_email.date) + self.assertEqual('', parsed_email.message_id) def test_parse_email_ignores_header_casing(self): self.assertEqual('one', parse_email('Message-ID: one').message_id)