From 8988dd0d41d25d1ec6810ced387bc2bea5af2dca Mon Sep 17 00:00:00 2001 From: nemunaire Date: Sun, 13 Sep 2015 11:18:07 +0200 Subject: [PATCH] =?UTF-8?q?striphtml:=20also=20convert=20=C2=B4=20and=20co?= =?UTF-8?q?llapse=20multiple=20space,=20as=20HTML=20display=20do?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nemubot/tools/web.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nemubot/tools/web.py b/nemubot/tools/web.py index 050d726..9ea0830 100644 --- a/nemubot/tools/web.py +++ b/nemubot/tools/web.py @@ -199,7 +199,10 @@ def striphtml(data): import re p = re.compile(r'<.*?>') - return htmlentitydecode(p.sub('', data) - .replace("(", "/(") - .replace(")", ")/") - .replace(""", "\"")) + r, _ = re.subn(r' +', ' ', htmlentitydecode(p.sub('', data) + .replace("(", "/(") + .replace(")", ")/") + .replace("'", "ยด") + .replace(""", "\"")) + .replace('\n', ' ')) + return r