Fix email.utils.parseaddr to handle multiple hops

Author: ioanatia

Lib/email/_parseaddr.py

@@ -338,6 +338,8 @@ def getrouteaddr(self):
             elif self.field[self.pos] == '@':
                 self.pos += 1
                 expectroute = True
+            elif self.field[self.pos] == ',':
+                self.pos += 1
             elif self.field[self.pos] == ':':
                 self.pos += 1
             else:

Lib/test/test_email/test_email.py

@@ -3141,6 +3141,12 @@ def test_parseaddr_preserves_spaces_in_local_part(self):
         self.assertEqual(('', 'merwok.wok.wok@xample.com'),
             utils.parseaddr('merwok. wok .  wok@xample.com'))
 
+    def test_parseaddr_handles_obsolete_addressing(self):
+        self.assertEqual(('foobar', 'foo@bar.com'),
+            utils.parseaddr('"foobar" <@hop.org:foo@bar.com>'))
+        self.assertEqual(('foobar', 'foo@bar.com'),
+            utils.parseaddr('"foobar" <@hop1.org,@hop2.org:foo@bar.com>'))
+
     def test_formataddr_does_not_quote_parens_in_quoted_string(self):
         addr = ("'foo@example.com' (foo@example.com)",
                 'foo@example.com')