Merge pull request #18 from yannik-ammann/master

support for format_html & conditional_escape

README.md

@@ -28,8 +28,10 @@ See a full example [here](https://github.com/arteria/django-hijack/blob/4966d886
 * atomic or commit_on_success (commit_on_success replaced by atomic in Django >=1.8)
 * BytesIO
 * clean_manytomany_helptext
+* conditional_escape
 * EmailValidator
 * force_text
+* format_html
 * GenericForeignKey
 * get_ident
 * get_model_name

compat/__init__.py

@@ -270,6 +270,34 @@ def create_permissions(*args, **kwargs):
     from .json_response import JsonResponse
 
 
+# format_html (django 1.6)
+
+try:
+    from django.utils.html import format_html, conditional_escape
+except ImportError:
+    # support django < 1.5. Taken from django.utils.html
+    from django.utils import six
+    def conditional_escape(text):
+        """
+        Similar to escape(), except that it doesn't operate on pre-escaped strings.
+        """
+        if isinstance(text, SafeData):
+            return text
+        else:
+            return escape(text)
+
+    def format_html(format_string, *args, **kwargs):
+        """
+        Similar to str.format, but passes all arguments through conditional_escape,
+        and calls 'mark_safe' on the result. This function should be used instead
+        of str.format or % interpolation to build up small HTML fragments.
+        """
+        args_safe = map(conditional_escape, args)
+        kwargs_safe = dict([(k, conditional_escape(v)) for (k, v) in
+                            six.iteritems(kwargs)])
+        return mark_safe(format_string.format(*args_safe, **kwargs_safe))
+
+
 ### Undocumented ###
 
 try:
@@ -328,5 +356,8 @@ def create_permissions(*args, **kwargs):
     'slugify',
     'GenericForeignKey',
     'SortedDict',
-    'atomic', 'commit_on_success', # alias
+    'atomic',
+    'commit_on_success', # alias
+    'format_html',
+    'conditional_escape',
 ]