Changeset 55

Timestamp:

12/14/06 20:22:07 (2 years ago)

Author:

verbosus

Message:

Removed htmlescape in favor of cgi.escape (thanks, C8E)

Files:

• hacks/trunk/statusbot/statusbot.py (modified) (3 diffs)

hacks/trunk/statusbot/statusbot.py

@@ -5 +5 @@
 
 import re
+from cgi import escape
 import time, sys, codecs
 import jabberbot
@@ -11 +12 @@
 __svnid__ = "$Id$"
 
-def htmlescape(input):
-    return input.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;')
-
 def extract_link(input):
     link_r = re.compile(r'(?P<desc>.*?): (?P<uri>(http://.*)+)')
@@ -19 +17 @@
     if results:
         return u'<a href="%s">%s</a>' % \
-            (results.group('uri'), htmlescape(results.group('desc')))
+            (results.group('uri'), escape(results.group('desc')))
     else:
-        return htmlescape(input)
+        return escape(input)
 
 def save_status(status):
     """Write status (a unicode string) to filename (as UTF-8)"""
-    template = codecs.open(
-        '/path/to/template.html', 'r', 'utf-8')
+    template = codecs.open('/path/to/template.html', 'r', 'utf-8')
     t = template.read()
-    f = codecs.open(
-        '/path/to/output.html', 'w', 'utf-8')
+    f = codecs.open('/path/to/output.html', 'w', 'utf-8')
     status = extract_link(status)
     f.write(t.replace(u'{{ status }}', status))