mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 10:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

git-multimail: update to release 1.1.1

Browse Source 
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>
This commit is contained in:
Matthieu Moy 2015-07-05 13:10:17 +02:00 committed by Junio C Hamano
parent cbed29f37b
commit 5bdb7a78ad
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/hooks/multimail/CHANGES
View File

@ -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
=============

2
contrib/hooks/multimail/README
View File

@ -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

4
contrib/hooks/multimail/README.Git
View File

@ -6,10 +6,10 @@ website:
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
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.

12
contrib/hooks/multimail/git_multimail.py
View File

@ -1745,14 +1745,20 @@ class SMTPMailer(Mailer):
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':
self.smtp = smtplib.SMTP(self.smtpserver, timeout=self.smtpservertimeout)
self.smtp = call(smtplib.SMTP, self.smtpserver, timeout=self.smtpservertimeout)
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
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()