Because it was just to damn confusing, rename IAddress.address to

IAddress.email and IAddress.original_address to IAddress.original_email.  From
now on we'll use "address" to talk about the IAddress object and "email" to
talk about the textual email address.

2 files changed, 4 insertions, 4 deletions

diff --git a/src/mailman/queue/digest.py b/src/mailman/queue/digest.py
index 46228580d..3b2aff11c 100644
--- a/src/mailman/queue/digest.py
+++ b/src/mailman/queue/digest.py
@@ -337,7 +337,7 @@ class DigestRunner(Runner):
                 continue
             # Send the digest to the case-preserved address of the digest
             # members.
-            email_address = member.address.original_address
+            email_address = member.address.original_email
             if member.delivery_mode == DeliveryMode.plaintext_digests:
                 rfc1153_recipients.add(email_address)
             elif member.delivery_mode == DeliveryMode.mime_digests:
@@ -349,9 +349,9 @@ class DigestRunner(Runner):
         # Add also the folks who are receiving one last digest.
         for address, delivery_mode in mlist.last_digest_recipients:
             if delivery_mode == DeliveryMode.plaintext_digests:
-                rfc1153_recipients.add(address.original_address)
+                rfc1153_recipients.add(address.original_email)
             elif delivery_mode == DeliveryMode.mime_digests:
-                mime_recipients.add(address.original_address)
+                mime_recipients.add(address.original_email)
             else:
                 raise AssertionError(
                     'OLD recipient "{0}" unexpected delivery mode: {1}'.format(
diff --git a/src/mailman/queue/docs/incoming.txt b/src/mailman/queue/docs/incoming.txt
index b0f644098..75130c4cc 100644
--- a/src/mailman/queue/docs/incoming.txt
+++ b/src/mailman/queue/docs/incoming.txt
@@ -71,7 +71,7 @@ not linked to a user and are unverified.
     ...     email = '{0}@example.com'.format(localpart)
     ...     address = user_manager.get_address(email)
     ...     print '{0}; verified? {1}; user? {2}'.format(
-    ...         address.address,
+    ...         address.email,
     ...         ('No' if address.verified_on is None else 'Yes'),
     ...         user_manager.get_user(email))
     xperson@example.com; verified? No; user? None