Merge pull request #3 from graingert/patch-2

Brian Luft · Brian Luft · commit c85171734b55 · 2012-09-26T10:30:38.000-07:00
use mark_safe for json output
diff --git a/README.rst b/README.rst
@@ -26,7 +26,7 @@ it in a Django template::
 
     <script id="source" language="javascript" type="text/javascript"> 
     $(function () {
-        $.plot($("#linear-graph"), {{ graph.series_json|safe }}, {{ graph.options_json|safe }});
+        $.plot($("#linear-graph"), {{ graph.series_json }}, {{ graph.options_json }});
     });
     </script>     
 
diff --git a/docs/index.rst b/docs/index.rst
@@ -33,7 +33,7 @@ it in a Django template:
     <div id="linear-graph" style="width:600px;height:400px"></div>
     <script id="source" language="javascript" type="text/javascript"> 
     $(function () {
-        $.plot($("#linear-graph"), {{ graph.series_json|safe }}, {{ graph.options_json|safe }});
+        $.plot($("#linear-graph"), {{ graph.series_json }}, {{ graph.options_json }});
     });
     </script>     
 
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):
         """
diff --git a/pyflot/templates/test_page.html b/pyflot/templates/test_page.html
@@ -9,7 +9,7 @@
         <script type="text/javascript" src="pyflot/templates/jquery.flot.min.js"></script>
         <script type="text/javascript">
             $(function () {
-                $.plot($("#testgraph"), {{ graph.series_json|safe }}, {{ graph.options_json|safe }});
+                $.plot($("#testgraph"), {{ graph.series_json }}, {{ graph.options_json }});
             });
         </script>
     </head>
