commit bd33f1170e3241e2b5e061e44ec05b8d175e5739
author Armin Ronacher <armin.ronacher@active-4.com> Fri Apr 18 09:17:32 2008 +0200
committer Armin Ronacher <armin.ronacher@active-4.com> Fri Apr 18 09:17:32 2008 +0200
tree 772b36a6ddedab4bab6df853950c607806075076
parent 284f200ab1803ff10757131ba63f06dd9bbe161d

added C escape and tb_set_next functions

--HG--
branch : trunk

jinja2/utils.py

diff --git a/jinja2/utils.py b/jinja2/utils.py
index c030d24..5e6b403 100644
--- a/jinja2/utils.py
+++ b/jinja2/utils.py
@@ -16,20 +16,6 @@
 from itertools import imap
 
 
-def escape(obj, attribute=False):
-    """HTML escape an object."""
-    if obj is None:
-        return u''
-    elif hasattr(obj, '__html__'):
-        return obj.__html__()
-    return Markup(unicode(obj)
-        .replace('&', '&')
-        .replace('>', '>')
-        .replace('<', '&lt;')
-        .replace('"', '&quot;')
-    )
-
-
 def soft_unicode(s):
     """Make a string unicode if it isn't already.  That way a markup
     string is not converted back to unicode.
@@ -317,3 +303,23 @@
         rv._mapping = deepcopy(self._mapping)
         rv._queue = deepcopy(self._queue)
         return rv
+
+
+# we have to import it down here as the speedups module imports the
+# markup type which is define above.
+try:
+    from jinja2._speedups import escape
+except ImportError:
+    def escape(obj):
+        """Convert the characters &, <, >, and " in string s to HTML-safe
+        sequences. Use this if you need to display text that might contain
+        such characters in HTML.
+        """
+        if hasattr(obj, '__html__'):
+            return obj.__html__()
+        return Markup(unicode(obj)
+            .replace('&', '&amp;')
+            .replace('>', '&gt;')
+            .replace('<', '&lt;')
+            .replace('"', '&quot;')
+        )