Override NotifyEmail.send() so we can provide the from_name

No more swapping around of config values.

Author: schwuk

code_comments/notification.py

@@ -138,7 +138,7 @@ def get_recipients(self, comment):
 
         return (torcpts, ccrcpts)
 
-    def _get_name(self, comment):
+    def _get_author_name(self, comment):
         """
         Get the real name of the user who made the comment. If it cannot be
         determined, return their username.
@@ -150,6 +150,7 @@ def _get_name(self, comment):
         return comment.author
 
     def notify(self, comment):
+        self.comment_author = self._get_author_name(comment)
 
         self.data.update({
             "comment": comment,
@@ -158,18 +159,11 @@ def notify(self, comment):
         projname = self.config.get("project", "name")
         subject = "Re: [%s] %s" % (projname, comment.link_text())
 
-        # Temporarily switch the smtp_from_name setting so we can pretend
-        # the mail came from the author of the comment
-        try:
-            from_name = self._get_name(comment)
-            self.env.log.debug("Changing smtp_from_name to %s" % from_name)
-            old_setting = self.config['notification'].get('smtp_from_name')
-            self.config.set('notification', 'smtp_from_name', from_name)
-            try:
-                NotifyEmail.notify(self, comment, subject)
-            except:
-                pass
-        finally:
-            self.env.log.debug("Changing smtp_from_name back to %s" %
-                               old_setting)
-            self.config.set('notification', 'smtp_from_name', old_setting)
+        NotifyEmail.notify(self, comment, subject)
+
+    def send(self, torcpts, ccrcpts):
+        """
+        Override NotifyEmail.send() so we can provide from_name.
+        """
+        self.from_name = self.comment_author
+        NotifyEmail.send(self, torcpts, ccrcpts)