Ensure EmailAddress display name is unicode

mailgun · May 10, 2017 · 67b57de · 67b57de
1 parent c439f6e
commit 67b57de
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/flanker/addresslib/address.py b/flanker/addresslib/address.py
@@ -115,6 +115,8 @@ def parse(address, addr_spec_only=False, metrics=False, fallback_last_word=False
 
             retval = _lift_parser_result(parser.parse(addr_spec, lexer=lexer.clone()))
             retval._display_name = display_name
+            if isinstance(retval._display_name, str):
+                retval._display_name = retval._display_name.decode('utf-8')
 
             mtimes['parsing'] += time() - bstart
 

diff --git a/tests/addresslib/address_test.py b/tests/addresslib/address_test.py
@@ -261,15 +261,16 @@ def test_contains_domain_literal():
 
 
 def test_parse_fallback_last_word():
-    eq_('foo <foo@bar.com>',             parse('foo <foo@bar.com>', fallback_last_word=True).full_spec())
-    eq_('foo <foo@bar.com>',             parse('foo foo@bar.com', fallback_last_word=True).full_spec())
-    eq_('foo <foo@bar.com>',             parse('foo (comment) <foo@bar.com>', fallback_last_word=True).full_spec())
-    eq_('"foo (comment)" <foo@bar.com>', parse('foo (comment) foo@bar.com', fallback_last_word=True).full_spec())
-    eq_('"not@valid" <foo@bar.com>',     parse('not@valid <foo@bar.com>', fallback_last_word=True).full_spec())
-    eq_('"not@valid" <foo@bar.com>',     parse('not@valid foo@bar.com', fallback_last_word=True).full_spec())
+    eq_(u'foo <foo@bar.com>',             parse('foo <foo@bar.com>', fallback_last_word=True).to_unicode())
+    eq_(u'foo <foo@bar.com>',             parse('foo foo@bar.com', fallback_last_word=True).to_unicode())
+    eq_(u'foo <foo@bar.com>',             parse('foo (comment) <foo@bar.com>', fallback_last_word=True).to_unicode())
+    eq_(u'"foo (comment)" <foo@bar.com>', parse('foo (comment) foo@bar.com', fallback_last_word=True).to_unicode())
+    eq_(u'"not@valid" <foo@bar.com>',     parse('not@valid <foo@bar.com>', fallback_last_word=True).to_unicode())
+    eq_(u'"not@valid" <foo@bar.com>',     parse('not@valid foo@bar.com', fallback_last_word=True).to_unicode())
+    eq_(u'Маруся <мария@example.com>',    parse('Маруся мария@example.com', fallback_last_word=True).to_unicode())
 
 
 def test_parse_list_fallback_last_word():
     addr_list = ['foo <foo@bar.com>', 'foo foo@bar.com', 'not@valid <foo@bar.com>']
     expected = ['foo <foo@bar.com>', 'foo <foo@bar.com>', '"not@valid" <foo@bar.com>']
-    eq_(expected, [addr.full_spec() for addr in parse_list(addr_list, fallback_last_word=True)])
+    eq_(expected, [addr.to_unicode() for addr in parse_list(addr_list, fallback_last_word=True)])