else:
return None
-def __parse_addresses(string):
+def __parse_addresses(addresses):
"""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 = []
- 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):
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):
headers_end = __build_address_headers(options)
headers_end += 'Message-Id: %s\n' % msg_id
+ if options.refid:
+ headers_end += "In-Reply-To: %s\n" % options.refid
+ headers_end += "References: %s\n" % options.refid
if options.version:
version_str = ' %s' % options.version
if options.cover:
tfile_list = [options.cover]
else:
- tfile_list = [os.path.join(git.base_dir, 'covermail.tmpl'),
+ tfile_list = [os.path.join(git.get_base_dir(), 'covermail.tmpl'),
os.path.join(sys.prefix,
'share/stgit/templates/covermail.tmpl')]
if options.template:
tfile_list = [options.template]
else:
- tfile_list = [os.path.join(git.base_dir, 'patchmail.tmpl'),
+ tfile_list = [os.path.join(git.get_base_dir(), 'patchmail.tmpl'),
os.path.join(sys.prefix,
'share/stgit/templates/patchmail.tmpl')]
tmpl = None