Merge branch 'bug.blank_username_in_settings' of dairiki/pyramid_mail…

…er into pull/70

CHANGES.rst

@@ -4,6 +4,11 @@ Changelog
 Unreleased
 ----------
 
+- Pull #70: If ``username`` and ``password`` are both set to the empty string,
+  ``Mailer.from_settings``, now interprets them as being set to ``None``.
+  Previously, setting them to the empty string caused SMTP authentication
+  to be force with empty username and password.
+
 - Pull #71: Add a ``content_id`` argument to the ``Attachment`` constructor
   which allows you to set the Content-ID header so you can reference it from
   an HTML body.

CONTRIBUTORS.txt

@@ -133,6 +133,8 @@ Contributors
 
 - Mário Idival, 2015-05-21
 
+- Geoffrey T. Dairiki, 2015-06-30
+
 - Ingmar Steen, 2015-08-20
 
 - Daniel Kraus, 2015-08-27

pyramid_mailer/mailer.py

@@ -246,7 +246,16 @@ def from_settings(cls, settings, prefix='mail.'):
             if key in kwargs:
                 kwargs[key] = aslist(kwargs.get(key))
 
-        return cls(**kwargs)
+        username = kwargs.pop('username', None)
+        password = kwargs.pop('password', None)
+        if not (username or password):
+            # Setting both username and password to the empty string,
+            # causes repoze.sendmail.mailer.SMTPMailer to authenticate.
+            # This most likely makes no sense, so, in that case
+            # set username to None to skip authentication.
+            username = password = None
+
+        return cls(username=username, password=password, **kwargs)
 
     def send(self, message):
         """Send a message.

pyramid_mailer/tests/test_mailer.py

@@ -248,6 +248,14 @@ def test_from_settings_with_str_values(self):
         self.assertEqual(mailer.sendmail_mailer.sendmail_template,
                     ['{sendmail_app}', '--option1', '--option2', '{sender}'])
 
+    def test_from_settings_with_empty_username(self):
+        settings = {'mymail.username': '',
+                    'mymail.password': ''}
+        mailer = self._getTargetClass().from_settings(settings,
+                                                      prefix='mymail.')
+        self.assertEqual(mailer.direct_delivery.mailer.username, None)
+        self.assertEqual(mailer.direct_delivery.mailer.password, None)
+
     def test_send_immediately(self):
         import socket
         mailer = self._makeOne(host='localhost', port='28322')