--- a/plugins/rss_plugin.py Sat May 19 15:22:09 2007 +0200
+++ b/plugins/rss_plugin.py Sun May 20 09:46:49 2007 +0200
@@ -17,25 +17,24 @@
################################################################################
import re
-def rss_remove_html(text):
- exp = re.compile('<[^>]*>')
- text = exp.sub('', text)
- notags = text.replace('<', '<').replace('>', '>')
- noescape = notags.replace('&', '&').replace('<', '<').replace('>', '>').replace('"', '"')
- noescape = noescape.replace('<p>', '')
- noescape = noescape.replace('</p>', '')
- noescape = noescape.replace('<p />', '').replace('<p/>', '')
- return noescape
-""" OLD CODE: REMOVE LATER IF NEW FUNCTION (added 2005-10-12) WORKS
+html_table = [
+ ('<p>' , '' ),
+ ('</p>' , '' ),
+ ('<p />', '' ),
+ ('<p/>' , '' ),
+ ('>' , '>'),
+ ('>' , '>'),
+ ('<' , '<'),
+ ('"' , '"'),
+ ('&' , '&'),
+]
+
def rss_remove_html(text):
- notags = text.replace('<', '<').replace('>', '>')
- noescape = notags.replace('&', '&').replace('<', '<').replace('>', '>').replace('"', '"')
- noescape = noescape.replace('<p>', '')
- noescape = noescape.replace('</p>', '')
- noescape = noescape.replace('<p />', '').replace('<p/>', '')
- return noescape
-"""
+ text = re.sub(r'<[^>]*>', '', text)
+ for bad, new in html_table :
+ text = text.replace(bad, new)
+ return text
def rss_update_file():
global RSS_CACHE