use mark_safe for json output

graingert · graingert · commit ad469cc65502 · 2012-09-13T19:33:11.000+02:00
diff --git a/pyflot/graph.py b/pyflot/graph.py
@@ -15,6 +15,7 @@
 import inspect
 import json
 import time
+from django.utils.safestring import mark_safe
 
 
 __title__ = 'pyflot'
@@ -23,6 +24,9 @@
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2011 Brian Luft'
 
+def safe_json(obj):
+    return mark_safe(json.dumps(obj))
+
 
 def update(d, u):
     """
@@ -84,7 +88,7 @@ def series_json(self):
         associated with this graph formatted as JSON, 
         suitable for passing to the ``$.plot`` method.
         """
-        return json.dumps([self.prepare_series(s) for s in self._series])
+        return safe_json([self.prepare_series(s) for s in self._series])
 
     @property
     def options_json(self):
@@ -93,7 +97,7 @@ def options_json(self):
         for this graph in a format suitable for passing to 
         the ``$.plot`` method as the options parameter.
         """
-        return json.dumps(self._options)
+        return safe_json(self._options)
 
     def __getattr__(self, value):
         """
