mailing: switched from homebrew lib to pyramid_mailer with python3 compatability

configs/development.ini

@@ -26,8 +26,6 b' debug = true'
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
-## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
-#smtp_auth =
 
 [server:main]
 ## COMMON ##

configs/production.ini

@@ -26,8 +26,6 b' debug = true'
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
-## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
-#smtp_auth =
 
 [server:main]
 ## COMMON ##

docs/install/setup-email.rst

@@ -19,9 +19,7 b' Once configured you can check the settin'
     ## Additionally these settings will be used by the RhodeCode mailing system   ##
     ################################################################################
     #email_to = admin@localhost
-    #error_email_from = paste_error@localhost
     #app_email_from = rhodecode-noreply@localhost
-    #error_message =
     #email_prefix = [RhodeCode]
 
     #smtp_server = mail.server.com
@@ -30,5 +28,3 b' Once configured you can check the settin'
     #smtp_port =
     #smtp_use_tls = false
     #smtp_use_ssl = true
-    ## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
-    #smtp_auth =

pkgs/python-packages.nix

@@ -1368,6 +1368,22 b' self: super: {'
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
+  "pyramid-mailer" = super.buildPythonPackage {
+    name = "pyramid-mailer-0.15.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."pyramid"
+      self."repoze.sendmail"
+      self."transaction"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/a0/f2/6febf5459dff4d7e653314d575469ad2e11b9d2af2c3606360e1c67202f2/pyramid_mailer-0.15.1.tar.gz";
+      sha256 = "16vg8jb203jgb7b0hd6wllfqvp542qh2ry1gjai2m6qpv5agy2pc";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.bsdOriginal ];
+    };
+  };
   "pyramid-mako" = super.buildPythonPackage {
     name = "pyramid-mako-1.0.2";
     doCheck = false;
@@ -1596,6 +1612,22 b' self: super: {'
       license = [ { fullName = "Repoze Public License"; } { fullName = "BSD-derived (http://www.repoze.org/LICENSE.txt)"; } ];
     };
   };
+  "repoze.sendmail" = super.buildPythonPackage {
+    name = "repoze.sendmail-4.4.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."setuptools"
+      self."zope.interface"
+      self."transaction"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/12/4e/8ef1fd5c42765d712427b9c391419a77bd48877886d2cbc5e9f23c8cad9b/repoze.sendmail-4.4.1.tar.gz";
+      sha256 = "096ln02jr2afk7ab9j2czxqv2ryqq7m86ah572nqplx52iws73ks";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.zpl21 ];
+    };
+  };
   "requests" = super.buildPythonPackage {
     name = "requests-2.9.1";
     doCheck = false;
@@ -1685,6 +1717,7 b' self: super: {'
       self."pyramid-jinja2"
       self."pyramid-mako"
       self."pyramid"
+      self."pyramid-mailer"
       self."pysqlite"
       self."python-dateutil"
       self."python-ldap"
@@ -1970,6 +2003,20 b' self: super: {'
       license = [ pkgs.lib.licenses.bsdOriginal ];
     };
   };
+  "transaction" = super.buildPythonPackage {
+    name = "transaction-2.2.1";
+    doCheck = false;
+    propagatedBuildInputs = [
+      self."zope.interface"
+    ];
+    src = fetchurl {
+      url = "https://files.pythonhosted.org/packages/a6/5e/09da91cb9373c73aae41721e5571c47db72fa9e11b259ca8fd3b01e306e9/transaction-2.2.1.tar.gz";
+      sha256 = "0ykcfx5mw76z8wwg6a68ahr52q3qa75hky1xx9axbr9pwiq2097j";
+    };
+    meta = {
+      license = [ pkgs.lib.licenses.zpl21 ];
+    };
+  };
   "translationstring" = super.buildPythonPackage {
     name = "translationstring-1.3";
     doCheck = false;

requirements.txt

@@ -61,6 +61,7 b' pyramid-debugtoolbar==4.4.0'
 pyramid-jinja2==2.7
 pyramid-mako==1.0.2
 pyramid==1.9.2
+pyramid_mailer==0.15.1
 pysqlite==2.8.3
 python-dateutil
 python-ldap==3.1.0

rhodecode/lib/celerylib/tasks.py

@@ -26,11 +26,13 b' by celery daemon'
 import os
 import time
 
+from pyramid_mailer.mailer import Mailer
+from pyramid_mailer.message import Message
+
 import rhodecode
 from rhodecode.lib import audit_logger
 from rhodecode.lib.celerylib import get_logger, async_task, RequestContextTask
 from rhodecode.lib.hooks_base import log_create_repository
-from rhodecode.lib.rcmail.smtp_mailer import SmtpMailer
 from rhodecode.lib.utils2 import safe_int, str2bool
 from rhodecode.model.db import Session, IntegrityError, Repository, User, true
 
@@ -58,7 +60,11 b' def send_email(recipients, subject, body'
         return False
 
     subject = "%s %s" % (email_config.get('email_prefix', ''), subject)
-    if not recipients:
+
+    if recipients:
+        if isinstance(recipients, basestring):
+            recipients = recipients.split(',')
+    else:
         # if recipients are not defined we send to email_config + all admins
         admins = []
         for u in User.query().filter(User.admin == true()).all():
@@ -70,19 +76,44 b' def send_email(recipients, subject, body'
             recipients += [config_email]
         recipients += admins
 
-    mail_from = email_config.get('app_email_from', 'RhodeCode')
-    user = email_config.get('smtp_username')
-    passwd = email_config.get('smtp_password')
-    mail_port = email_config.get('smtp_port')
-    tls = str2bool(email_config.get('smtp_use_tls'))
-    ssl = str2bool(email_config.get('smtp_use_ssl'))
-    debug = str2bool(email_config.get('debug'))
-    smtp_auth = email_config.get('smtp_auth')
+    # translate our LEGACY config into the one that pyramid_mailer supports
+    email_conf = dict(
+        host=mail_server,
+        port=email_config.get('smtp_port'),
+        username=email_config.get('smtp_username'),
+        password=email_config.get('smtp_password'),
+
+        tls=str2bool(email_config.get('smtp_use_tls')),
+        ssl=str2bool(email_config.get('smtp_use_ssl')),
+
+        # SSL key file
+        # keyfile='',
+
+        # SSL certificate file
+        # certfile='',
+
+        # Location of maildir
+        # queue_path='',
+
+        default_sender=email_config.get('app_email_from', 'RhodeCode'),
+
+        debug=str2bool(email_config.get('smtp_debug')),
+        # /usr/sbin/sendmail	Sendmail executable
+        # sendmail_app='',
+
+        # {sendmail_app} -t -i -f {sender}	Template for sendmail execution
+        # sendmail_template='',
+    )
 
     try:
-        m = SmtpMailer(mail_from, user, passwd, mail_server, smtp_auth,
-                       mail_port, ssl, tls, debug=debug)
-        m.send(recipients, subject, body, html_body)
+        mailer = Mailer(**email_conf)
+
+        message = Message(subject=subject,
+                          sender=email_conf['default_sender'],
+                          recipients=recipients,
+                          body=body, html=html_body)
+        mailer.send_immediately(message)
+
     except Exception:
         log.exception('Mail sending failed')
         return False

rhodecode/templates/admin/settings/settings_email.mako

@@ -6,9 +6,7 b''
         <%
          elems = [
             (_('Email prefix'), c.rhodecode_ini.get('email_prefix'), ''),
-            (_('RhodeCode email from'), c.rhodecode_ini.get('app_email_from'), ''),
-            (_('Error email from'), c.rhodecode_ini.get('error_email_from'), ''),
-            (_('Error email recipients'), c.rhodecode_ini.get('email_to'), ''),
+            (_('Email from'), c.rhodecode_ini.get('app_email_from'), ''),
 
             (_('SMTP server'), c.rhodecode_ini.get('smtp_server'), ''),
             (_('SMTP username'), c.rhodecode_ini.get('smtp_username'), ''),
@@ -17,7 +15,7 b''
 
             (_('SMTP use TLS'), c.rhodecode_ini.get('smtp_use_tls'), ''),
             (_('SMTP use SSL'), c.rhodecode_ini.get('smtp_use_ssl'), ''),
-            (_('SMTP auth'), c.rhodecode_ini.get('smtp_auth'), ''),
+
          ]
         %>
         <dl class="dl-horizontal settings">
@@ -54,7 +52,3 b''
         ${h.end_form()}
     </div>
 </div>
-
-
-
-

rhodecode/tests/rhodecode.ini

@@ -25,21 +25,12 b' debug = true'
 ## note: using appenlight for error handling doesn't need this to be uncommented
 #email_to = admin@localhost
 
-## in case of Application errors, sent an error email form
-#error_email_from = rhodecode_error@localhost
-
-## additional error message to be send in case of server crash
-#error_message =
-
-
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
-## Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
-#smtp_auth =
 
 [server:main]
 ## COMMON ##