Merge branch 'master' into patch-2

This commit is contained in:
Sergey Obukhov
2018-11-02 09:13:42 +03:00
committed by GitHub

View File

@@ -38,6 +38,8 @@ RE_ON_DATE_SMB_WROTE = re.compile(
'Op', 'Op',
# German # German
'Am', 'Am',
# Portuguese
'Em',
# Norwegian # Norwegian
u'', u'',
# Swedish, Danish # Swedish, Danish
@@ -64,6 +66,8 @@ RE_ON_DATE_SMB_WROTE = re.compile(
'schreef','verzond','geschreven', 'schreef','verzond','geschreven',
# German # German
'schrieb', 'schrieb',
# Portuguese
'escreveu',
# Norwegian, Swedish # Norwegian, Swedish
'skrev', 'skrev',
# Vietnamese # Vietnamese
@@ -286,7 +290,7 @@ def process_marked_lines(lines, markers, return_flags=[False, -1, -1]):
# inlined reply # inlined reply
# use lookbehind assertions to find overlapping entries e.g. for 'mtmtm' # use lookbehind assertions to find overlapping entries e.g. for 'mtmtm'
# both 't' entries should be found # both 't' entries should be found
for inline_reply in re.finditer('(?<=m)e*((?:t+e*)+)m', markers): for inline_reply in re.finditer('(?<=m)e*(t[te]*)m', markers):
# long links could break sequence of quotation lines but they shouldn't # long links could break sequence of quotation lines but they shouldn't
# be considered an inline reply # be considered an inline reply
links = ( links = (