git-multimail: update to release 1.1.1

The only change is a bugfix: the SMTP mailer was not working with
Python 2.4.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/hooks/multimail/CHANGES b/contrib/hooks/multimail/CHANGES
index 0b823d8f5f6eaa13f900bfbb0152383b32be20b8..6bb12306b8210ea2d7ae58d6e997801ec44e1604 100644 (file)
--- a/contrib/hooks/multimail/CHANGES
+++ b/contrib/hooks/multimail/CHANGES
@@ -1,3 +1,8 @@
+Release 1.1.1 (bugfix-only release)
+===================================
+
+* The SMTP mailer was not working with Python 2.4.
+

 Release 1.1.0
 =============
 
 Release 1.1.0
 =============
 

diff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README
index 3a33cb734ab1d9297d036167cc3f7ef13241f2bf..e552c90c4511bfb0b60ede3d1dbe8e063c6fecf1 100644 (file)
--- a/contrib/hooks/multimail/README
+++ b/contrib/hooks/multimail/README
@@ -1,4 +1,4 @@
-git-multimail Version 1.1.0
+git-multimail Version 1.1.1

 ===========================
 
 .. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master
 ===========================
 
 .. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master

diff --git a/contrib/hooks/multimail/README.Git b/contrib/hooks/multimail/README.Git
index 449d36f1564b16daceae7efe79755da9d5920e1c..f5d59a8d313a3114c1fd0bdfa0faaea64a7b71d9 100644 (file)
--- a/contrib/hooks/multimail/README.Git
+++ b/contrib/hooks/multimail/README.Git
@@ -6,10 +6,10 @@ website:
     https://github.com/git-multimail/git-multimail
 
 The version in this directory was obtained from the upstream project
     https://github.com/git-multimail/git-multimail
 
 The version in this directory was obtained from the upstream project

-on Jun 18 2015 and consists of the "git-multimail" subdirectory from
+on July 03 2015 and consists of the "git-multimail" subdirectory from

 revision
 
 revision
 

-    1f0dbb3b60035767889b913df16d9231ecdb8709 refs/tags/1.1.0
+    6d6c9eb62a054143322cfaecde3949189c065b46 refs/tags/1.1.1

 
 Please see the README file in this directory for information about how
 to report bugs or contribute to git-multimail.
 
 Please see the README file in this directory for information about how
 to report bugs or contribute to git-multimail.

diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py
index 7cb2b36cb43da930fbe5baa2cb120676fe7663ae..c06ce7a5158175b684a70e6a148031593a12fb47 100755 (executable)
--- a/contrib/hooks/multimail/git_multimail.py
+++ b/contrib/hooks/multimail/git_multimail.py
@@ -1745,14 +1745,20 @@ def __init__(self, envelopesender, smtpserver,
         self.username = smtpuser
         self.password = smtppass
         try:
         self.username = smtpuser
         self.password = smtppass
         try:

+            def call(klass, server, timeout):
+                try:
+                    return klass(server, timeout=timeout)
+                except TypeError:
+                    # Old Python versions do not have timeout= argument.
+                    return klass(server)

             if self.security == 'none':
             if self.security == 'none':

-                self.smtp = smtplib.SMTP(self.smtpserver, timeout=self.smtpservertimeout)
+                self.smtp = call(smtplib.SMTP, self.smtpserver, timeout=self.smtpservertimeout)

             elif self.security == 'ssl':
             elif self.security == 'ssl':

-                self.smtp = smtplib.SMTP_SSL(self.smtpserver, timeout=self.smtpservertimeout)
+                self.smtp = call(smtplib.SMTP_SSL, self.smtpserver, timeout=self.smtpservertimeout)

             elif self.security == 'tls':
                 if ':' not in self.smtpserver:
                     self.smtpserver += ':587'  # default port for TLS
             elif self.security == 'tls':
                 if ':' not in self.smtpserver:
                     self.smtpserver += ':587'  # default port for TLS

-                self.smtp = smtplib.SMTP(self.smtpserver, timeout=self.smtpservertimeout)
+                self.smtp = call(smtplib.SMTP, self.smtpserver, timeout=self.smtpservertimeout)

                 self.smtp.ehlo()
                 self.smtp.starttls()
                 self.smtp.ehlo()
                 self.smtp.ehlo()
                 self.smtp.starttls()
                 self.smtp.ehlo()