{"thread":{"id":"39774","subject":"[PATCH] git-multimail: update to release 1.1.0","startedAt":"2015-07-03T14:53:43Z","lastAt":"2015-07-05T11:10:17Z","messageCount":2,"participants":["Matthieu Moy"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"265459","messageId":"1435935223-9730-1-git-send-email-Matthieu.Moy@imag.fr","threadId":"39774","inReplyTo":null,"subject":"[PATCH] git-multimail: update to release 1.1.0","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2015-07-03T14:53:43Z","receivedAt":"2015-07-03T14:53:43Z","isPatch":true,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"The only change is a bugfix: the SMTP mailer was not working with\nPython 2.4.\n\nSigned-off-by: Matthieu Moy \n---\n contrib/hooks/multimail/CHANGES | 5 +++++\n contrib/hooks/multimail/README | 2 +-\n contrib/hooks/multimail/README.Git | 4 ++--\n contrib/hooks/multimail/git_multimail.py | 12 +++++++++---\n 4 files changed, 17 insertions(+), 6 deletions(-)\n\ndiff --git a/contrib/hooks/multimail/CHANGES b/contrib/hooks/multimail/CHANGES\nindex 0b823d8..6bb1230 100644\n--- a/contrib/hooks/multimail/CHANGES\n+++ b/contrib/hooks/multimail/CHANGES\n@@ -1,3 +1,8 @@\n+Release 1.1.1 (bugfix-only release)\n+===================================\n+\n+* The SMTP mailer was not working with Python 2.4.\n+\n Release 1.1.0\n =============\n \ndiff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README\nindex 3a33cb7..e552c90 100644\n--- a/contrib/hooks/multimail/README\n+++ b/contrib/hooks/multimail/README\n@@ -1,4 +1,4 @@\n-git-multimail Version 1.1.0\n+git-multimail Version 1.1.1\n ===========================\n \n .. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master\ndiff --git a/contrib/hooks/multimail/README.Git b/contrib/hooks/multimail/README.Git\nindex 449d36f..f5d59a8 100644\n--- a/contrib/hooks/multimail/README.Git\n+++ b/contrib/hooks/multimail/README.Git\n@@ -6,10 +6,10 @@ website:\n https://github.com/git-multimail/git-multimail\n \n The version in this directory was obtained from the upstream project\n-on Jun 18 2015 and consists of the \"git-multimail\" subdirectory from\n+on July 03 2015 and consists of the \"git-multimail\" subdirectory from\n revision\n \n- 1f0dbb3b60035767889b913df16d9231ecdb8709 refs/tags/1.1.0\n+ 6d6c9eb62a054143322cfaecde3949189c065b46 refs/tags/1.1.1\n \n Please see the README file in this directory for information about how\n to report bugs or contribute to git-multimail.\ndiff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py\nindex 7cb2b36..c06ce7a 100755\n--- a/contrib/hooks/multimail/git_multimail.py\n+++ b/contrib/hooks/multimail/git_multimail.py\n@@ -1745,14 +1745,20 @@ class SMTPMailer(Mailer):\n self.username = smtpuser\n self.password = smtppass\n try:\n+ def call(klass, server, timeout):\n+ try:\n+ return klass(server, timeout=timeout)\n+ except TypeError:\n+ # Old Python versions do not have timeout= argument.\n+ return klass(server)\n if self.security == 'none':\n- self.smtp = smtplib.SMTP(self.smtpserver, timeout=self.smtpservertimeout)\n+ self.smtp = call(smtplib.SMTP, self.smtpserver, timeout=self.smtpservertimeout)\n elif self.security == 'ssl':\n- self.smtp = smtplib.SMTP_SSL(self.smtpserver, timeout=self.smtpservertimeout)\n+ self.smtp = call(smtplib.SMTP_SSL, self.smtpserver, timeout=self.smtpservertimeout)\n elif self.security == 'tls':\n if ':' not in self.smtpserver:\n self.smtpserver += ':587' # default port for TLS\n- self.smtp = smtplib.SMTP(self.smtpserver, timeout=self.smtpservertimeout)\n+ self.smtp = call(smtplib.SMTP, self.smtpserver, timeout=self.smtpservertimeout)\n self.smtp.ehlo()\n self.smtp.starttls()\n self.smtp.ehlo()\n-- \n2.5.0.rc0.7.ge1edd74.dirty\n"},{"id":"265528","messageId":"1436094617-4306-1-git-send-email-Matthieu.Moy@imag.fr","threadId":"39774","inReplyTo":"1435935223-9730-1-git-send-email-Matthieu.Moy@imag.fr","subject":"[PATCH v2] git-multimail: update to release 1.1.1","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2015-07-05T11:10:17Z","receivedAt":"2015-07-05T11:10:17Z","isPatch":true,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"The only change is a bugfix: the SMTP mailer was not working with\nPython 2.4.\n\nSigned-off-by: Matthieu Moy \n---\nI just fixed the title line (1.1.0 -> 1.1.0).\n\n contrib/hooks/multimail/CHANGES | 5 +++++\n contrib/hooks/multimail/README | 2 +-\n contrib/hooks/multimail/README.Git | 4 ++--\n contrib/hooks/multimail/git_multimail.py | 12 +++++++++---\n 4 files changed, 17 insertions(+), 6 deletions(-)\n\ndiff --git a/contrib/hooks/multimail/CHANGES b/contrib/hooks/multimail/CHANGES\nindex 0b823d8..6bb1230 100644\n--- a/contrib/hooks/multimail/CHANGES\n+++ b/contrib/hooks/multimail/CHANGES\n@@ -1,3 +1,8 @@\n+Release 1.1.1 (bugfix-only release)\n+===================================\n+\n+* The SMTP mailer was not working with Python 2.4.\n+\n Release 1.1.0\n =============\n \ndiff --git a/contrib/hooks/multimail/README b/contrib/hooks/multimail/README\nindex 3a33cb7..e552c90 100644\n--- a/contrib/hooks/multimail/README\n+++ b/contrib/hooks/multimail/README\n@@ -1,4 +1,4 @@\n-git-multimail Version 1.1.0\n+git-multimail Version 1.1.1\n ===========================\n \n .. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master\ndiff --git a/contrib/hooks/multimail/README.Git b/contrib/hooks/multimail/README.Git\nindex 449d36f..f5d59a8 100644\n--- a/contrib/hooks/multimail/README.Git\n+++ b/contrib/hooks/multimail/README.Git\n@@ -6,10 +6,10 @@ website:\n https://github.com/git-multimail/git-multimail\n \n The version in this directory was obtained from the upstream project\n-on Jun 18 2015 and consists of the \"git-multimail\" subdirectory from\n+on July 03 2015 and consists of the \"git-multimail\" subdirectory from\n revision\n \n- 1f0dbb3b60035767889b913df16d9231ecdb8709 refs/tags/1.1.0\n+ 6d6c9eb62a054143322cfaecde3949189c065b46 refs/tags/1.1.1\n \n Please see the README file in this directory for information about how\n to report bugs or contribute to git-multimail.\ndiff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py\nindex 7cb2b36..c06ce7a 100755\n--- a/contrib/hooks/multimail/git_multimail.py\n+++ b/contrib/hooks/multimail/git_multimail.py\n@@ -1745,14 +1745,20 @@ class SMTPMailer(Mailer):\n self.username = smtpuser\n self.password = smtppass\n try:\n+ def call(klass, server, timeout):\n+ try:\n+ return klass(server, timeout=timeout)\n+ except TypeError:\n+ # Old Python versions do not have timeout= argument.\n+ return klass(server)\n if self.security == 'none':\n- self.smtp = smtplib.SMTP(self.smtpserver, timeout=self.smtpservertimeout)\n+ self.smtp = call(smtplib.SMTP, self.smtpserver, timeout=self.smtpservertimeout)\n elif self.security == 'ssl':\n- self.smtp = smtplib.SMTP_SSL(self.smtpserver, timeout=self.smtpservertimeout)\n+ self.smtp = call(smtplib.SMTP_SSL, self.smtpserver, timeout=self.smtpservertimeout)\n elif self.security == 'tls':\n if ':' not in self.smtpserver:\n self.smtpserver += ':587' # default port for TLS\n- self.smtp = smtplib.SMTP(self.smtpserver, timeout=self.smtpservertimeout)\n+ self.smtp = call(smtplib.SMTP, self.smtpserver, timeout=self.smtpservertimeout)\n self.smtp.ehlo()\n self.smtp.starttls()\n self.smtp.ehlo()\n-- \n2.5.0.rc0.7.ge1edd74.dirty\n"}]}