~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a stack method for determining whether a branch is initialised
[stgit]
/
stgit
/
commands
/
mail.py
diff --git
a/stgit/commands/mail.py
b/stgit/commands/mail.py
index
566c669
..
7cc18bc
100644
(file)
--- a/
stgit/commands/mail.py
+++ b/
stgit/commands/mail.py
@@
-124,18
+124,18
@@
def __get_maintainer():
else:
return None
else:
return None
-def __parse_addresses(
string
):
+def __parse_addresses(
addresses
):
"""Return a two elements tuple: (from, [to])
"""
"""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():])
+ def __addr_list(
addrs
):
+
m = re.search('[^@\s<,]+@[^>\s,]+', addrs
);
+
if (m == None):
+ return []
+
return [ m.group() ] + __addr_list(addrs
[m.end():])
from_addr_list = []
to_addr_list = []
from_addr_list = []
to_addr_list = []
- for line in
string
.split('\n'):
+ for line in
addresses
.split('\n'):
if re.match('from:\s+', line, re.I):
from_addr_list += __addr_list(line)
elif re.match('(to|cc|bcc):\s+', line, re.I):
if re.match('from:\s+', line, re.I):
from_addr_list += __addr_list(line)
elif re.match('(to|cc|bcc):\s+', line, re.I):
@@
-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:
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:
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:
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):
return headers_end
def __build_cover(tmpl, total_nr, msg_id, options):