From d60cd083b1de0d100b96eacc4e172eca8da8f104 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 4 Nov 2005 17:33:50 +0000 Subject: [PATCH] Add a space after ',' when building the e-mail recipients headers This patch also untabifies the mail.py file. Signed-off-by: Catalin Marinas --- stgit/commands/mail.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py index 566c669..6a7d5d2 100644 --- a/stgit/commands/mail.py +++ b/stgit/commands/mail.py @@ -128,10 +128,10 @@ def __parse_addresses(string): """Return a two elements tuple: (from, [to]) """ def __addr_list(string): - m = re.search('[^@\s<,]+@[^>\s,]+', string); - if (m == None): - return [] - return [ m.group() ] + __addr_list(string[m.end():]) + m = re.search('[^@\s<,]+@[^>\s,]+', string); + if (m == None): + return [] + return [ m.group() ] + __addr_list(string[m.end():]) from_addr_list = [] to_addr_list = [] @@ -174,20 +174,20 @@ def __send_message(smtpserver, from_addr, to_addr_list, msg, sleep, def __build_address_headers(options): headers_end = '' if options.to: - headers_end += 'To: ' - for to in options.to: - headers_end += '%s,' % to - headers_end = headers_end[:-1] + '\n' + headers_end += 'To: ' + for to in options.to: + headers_end += '%s, ' % to + headers_end = headers_end[:-2] + '\n' if options.cc: - headers_end += 'Cc: ' - for cc in options.cc: - headers_end += '%s,' % cc - headers_end = headers_end[:-1] + '\n' + headers_end += 'Cc: ' + for cc in options.cc: + headers_end += '%s, ' % cc + headers_end = headers_end[:-2] + '\n' if options.bcc: - headers_end += 'Bcc: ' - for bcc in options.bcc: - headers_end += '%s,' % bcc - headers_end = headers_end[:-1] + '\n' + headers_end += 'Bcc: ' + for bcc in options.bcc: + headers_end += '%s, ' % bcc + headers_end = headers_end[:-2] + '\n' return headers_end def __build_cover(tmpl, total_nr, msg_id, options): -- 2.11.0