summaryrefslogtreecommitdiffstats
path: root/askbot/mail
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-11-07 17:47:25 -0300
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-11-07 17:47:25 -0300
commitc318671e0a5e2973e6d53bcac65a44375a006f3e (patch)
tree0b216af80802995babf256d299dbea0e1e53f844 /askbot/mail
parent5205f76f09ffa57dd0a9db0e1dc4d265962649dd (diff)
downloadaskbot-c318671e0a5e2973e6d53bcac65a44375a006f3e.tar.gz
askbot-c318671e0a5e2973e6d53bcac65a44375a006f3e.tar.bz2
askbot-c318671e0a5e2973e6d53bcac65a44375a006f3e.zip
fixed up yahoo quote re to work with plain text
Diffstat (limited to 'askbot/mail')
-rw-r--r--askbot/mail/parsing.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/askbot/mail/parsing.py b/askbot/mail/parsing.py
index d6c57775..2dd8199f 100644
--- a/askbot/mail/parsing.py
+++ b/askbot/mail/parsing.py
@@ -14,7 +14,7 @@ import sys
#to keep them simpler and make the additions of language variants
#easier.
GMAIL_QUOTE_RE = r'\nOn [^\n]* wrote:\Z'
-YAHOO_QUOTE_RE = r'\n_+\n From: [^\n]+\nTo: [^\n]+\nSent: [^\n]+\nSubject: [^\n]+\Z'
+YAHOO_QUOTE_RE = r'\n_+\n\s*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'\nSubject: [^\n]+\nFrom: [^\n]+\nTo: [^\n]+\nDate: [^\n]+\Z'
OUTLOOK_TEXT_QUOTE_RE = r'\n_+\Z'