summaryrefslogtreecommitdiffstats
path: root/askbot/mail
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-11-07 17:17:04 -0300
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-11-07 17:17:04 -0300
commite7b0e1c8f3ffa943fd28d081a9f2ba8acf6a06aa (patch)
treebf8436cc3756638be16a7debe66715e9472fa0e1 /askbot/mail
parent6e4e975636612756751417b42ab8f354e03bd10e (diff)
downloadaskbot-e7b0e1c8f3ffa943fd28d081a9f2ba8acf6a06aa.tar.gz
askbot-e7b0e1c8f3ffa943fd28d081a9f2ba8acf6a06aa.tar.bz2
askbot-e7b0e1c8f3ffa943fd28d081a9f2ba8acf6a06aa.zip
some changes to email quote separator regexes
Diffstat (limited to 'askbot/mail')
-rw-r--r--askbot/mail/parsing.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/askbot/mail/parsing.py b/askbot/mail/parsing.py
index 64a8f4a3..d6c57775 100644
--- a/askbot/mail/parsing.py
+++ b/askbot/mail/parsing.py
@@ -13,10 +13,10 @@ import sys
#expressions are stripped of month and day names
#to keep them simpler and make the additions of language variants
#easier.
-GMAIL_QUOTE_RE = r'\n\nOn [^\n]* wrote:\Z'
-YAHOO_QUOTE_RE = r'\n\n\n\n_+\n From: [^\n]+\nTo: [^\n]+\nSent: [^\n]+\nSubject: [^\n]+\Z'
+GMAIL_QUOTE_RE = r'\nOn [^\n]* wrote:\Z'
+YAHOO_QUOTE_RE = r'\n_+\n From: [^\n]+\nTo: [^\n]+\nSent: [^\n]+\nSubject: [^\n]+\Z'
KMAIL_QUOTE_RE = r'\AOn [^\n]+ you wrote:\s*\n\n'
-OUTLOOK_RTF_QUOTE_RE = r'\n\nSubject: [^\n]+\nFrom: [^\n]+\nTo: [^\n]+\nDate: [^\n]+\Z'
+OUTLOOK_RTF_QUOTE_RE = r'\nSubject: [^\n]+\nFrom: [^\n]+\nTo: [^\n]+\nDate: [^\n]+\Z'
OUTLOOK_TEXT_QUOTE_RE = r'\n_+\Z'
def compile_quote_regexes():