提交: ca6116cd20bae26533ce7ecb7f79b919904c3fce - allura (git)

allura

Commit MetaInfo

• 修订版: ca6116cd20bae26533ce7ecb7f79b919904c3fce (tree)
• 时间: 2012-05-31 02:25:16
• 作者: Dave Brondsema <dbrondsema@geek...>
• Commiter: Dave Brondsema

Log Message

[#4296] make all noreply hardcoded addresses be unicode

更改概述

• modified: Allura/allura/lib/mail_util.py
• modified: Allura/allura/model/discuss.py
• modified: Allura/allura/model/notification.py
• modified: Allura/allura/model/repository.py
• modified: Allura/allura/tasks/mail_tasks.py

差异

--- a/Allura/allura/lib/mail_util.py
+++ b/Allura/allura/lib/mail_util.py
@@ -149,7 +149,7 @@ def _parse_smtp_addr(addr):
     addrs = _parse_message_id(addr)
     if addrs and addrs[0]: return addrs[0]
     if '@' in addr: return addr
-    return '[e-mail]'
+    return u'[e-mail]'
 
 def isvalid(addr):
     '''return True if addr is a (possibly) valid email address, false

--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -217,7 +217,7 @@ class Thread(Artifact):
                 link=artifact.url(),
                 _id=artifact.url()+post._id,
                 from_address=str(author._id) if author != User.anonymous() else None,
-                reply_to_address='[e-mail]',
+                reply_to_address=u'[e-mail]',
                 subject=subject,
                 text=text,
                 in_reply_to=post.parent_id,

--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -133,7 +133,7 @@ class Notification(MappedClass):
                 _id=artifact.url()+post._id,
                 from_address=str(author._id) if author != User.anonymous() else None,
                 reply_to_address='"%s" <%s>' % (
-                    subject_prefix, getattr(artifact, 'email_address', '[e-mail]')),
+                    subject_prefix, getattr(artifact, 'email_address', u'[e-mail]')),
                 subject=subject_prefix + subject,
                 text=text,
                 in_reply_to=post.parent_id,
@@ -144,7 +144,7 @@ class Notification(MappedClass):
                     idx['title_s'],c.user.get_pref('display_name')))
             reply_to = '"%s" <%s>' % (
                 idx['title_s'],
-                getattr(artifact, 'email_address', '[e-mail]'))
+                getattr(artifact, 'email_address', u'[e-mail]'))
             d = dict(
                 from_address=reply_to,
                 reply_to_address=reply_to,
@@ -509,9 +509,9 @@ class Mailbox(MappedClass):
                         self.user_id, from_address, subject, ns, reply_to_address)
         elif self.type == 'digest':
             Notification.send_digest(
-                self.user_id, '[e-mail]', 'Digest Email',
+                self.user_id, u'[e-mail]', 'Digest Email',
                 notifications)
         elif self.type == 'summary':
             Notification.send_summary(
-                self.user_id, '[e-mail]', 'Digest Email',
+                self.user_id, u'[e-mail]', 'Digest Email',
                 notifications)

--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -255,7 +255,7 @@ class Repository(Artifact):
     @property
     def email_address(self):
         domain = '.'.join(reversed(self.app.url[1:-1].split('/'))).replace('_', '-')
-        return 'noreply@%s%s' % (domain, config.common_suffix)
+        return u'noreply@%s%s' % (domain, config.common_suffix)
 
     def index(self):
         result = Artifact.index(self)

--- a/Allura/allura/tasks/mail_tasks.py
+++ b/Allura/allura/tasks/mail_tasks.py
@@ -64,13 +64,13 @@ def sendmail(fromaddr, destinations, text, reply_to, subject,
     addrs_html = []
     addrs_multi = []
     if fromaddr is None:
-        fromaddr = '[e-mail]'
+        fromaddr = u'[e-mail]'
     elif '@' not in fromaddr:
         log.warning('Looking up user with fromaddr %s', fromaddr)
         user = M.User.query.get(_id=ObjectId(fromaddr))
         if not user:
             log.warning('Cannot find user with ID %s', fromaddr)
-            fromaddr = '[e-mail]'
+            fromaddr = u'[e-mail]'
         else:
             fromaddr = user.email_address_header()
     # Divide addresses based on preferred email formats
@@ -126,13 +126,13 @@ def sendsimplemail(
     in_reply_to=None):
     from allura import model as M
     if fromaddr is None:
-        fromaddr = '[e-mail]'
+        fromaddr = u'[e-mail]'
     elif '@' not in fromaddr:
         log.warning('Looking up user with fromaddr %s', fromaddr)
         user = M.User.query.get(_id=ObjectId(fromaddr))
         if not user:
             log.warning('Cannot find user with ID %s', fromaddr)
-            fromaddr = '[e-mail]'
+            fromaddr = u'[e-mail]'
         else:
             fromaddr = user.email_address_header()
     plain_msg = mail_util.encode_email_part(text, 'plain')