Merge pull request mjs#244 from mlorant/master

Fix mjs#242: handle address without mailbox name or host in Address namedtuple

Author: mjs

imapclient/response_types.py

@@ -80,9 +80,12 @@ class Address(namedtuple("Address", "name route mailbox host")):
     """
 
     def __str__(self):
-        return formataddr((
-            to_unicode(self.name),
-            to_unicode(self.mailbox) + '@' + to_unicode(self.host)))
+        if self.mailbox and self.host:
+            address = to_unicode(self.mailbox) + '@' + to_unicode(self.host)
+        else:
+            address = to_unicode(self.mailbox or self.host)
+
+        return formataddr((to_unicode(self.name), address))
 
 
 class SearchIds(list):

imapclient/test/test_response_parser.py

@@ -491,6 +491,12 @@ def test_Address_str(self):
         self.assertEqual(str(Address("Mary Jane", None, "mary", "jane.org")),
                          "Mary Jane <[email protected]>")
 
+        self.assertEqual(str(Address("Anonymous", None, "undisclosed-recipients", None)),
+                         "Anonymous <undisclosed-recipients>")
+
+        self.assertEqual(str(Address(None, None, None, "undisclosed-recipients")),
+                         "undisclosed-recipients")
+
 
 
 def add_crlf(text):