diff options
| author | Chris McDonough <chrism@plope.com> | 2013-01-01 21:39:48 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-01-01 21:39:48 -0500 |
| commit | cf7c15a6ceb0b96a7950daef2a33ee2464c655cb (patch) | |
| tree | c792a3bf12b2b2615fbb306e354c85b10983d63b /docs/narr/renderers.rst | |
| parent | 1b5c1c3df5eadf02b0e8818e32ee45e69b2c051f (diff) | |
| parent | c5d01d4667d678782898b7d6859d60c617e30a9e (diff) | |
| download | pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.gz pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.tar.bz2 pyramid-cf7c15a6ceb0b96a7950daef2a33ee2464c655cb.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'docs/narr/renderers.rst')
| -rw-r--r-- | docs/narr/renderers.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/narr/renderers.rst b/docs/narr/renderers.rst index 1158d2225..ecf625251 100644 --- a/docs/narr/renderers.rst +++ b/docs/narr/renderers.rst @@ -264,7 +264,7 @@ will be the active request object at render time. # [{"x": 1}, {"x": 2}] If you aren't the author of the objects being serialized, it won't be -possible (or at least not reasonable) to add a custom ``__json__`` method to +possible (or at least not reasonable) to add a custom ``__json__`` method to their classes in order to influence serialization. If the object passed to the renderer is not a serializable type, and has no ``__json__`` method, usually a :exc:`TypeError` will be raised during serialization. You can @@ -366,7 +366,7 @@ For example (Javascript): '&callback=?'; jqhxr = $.getJSON(api_url); -The string ``callback=?`` above in the the ``url`` param to the JQuery +The string ``callback=?`` above in the ``url`` param to the JQuery ``getAjax`` function indicates to jQuery that the query should be made as a JSONP request; the ``callback`` parameter will be automatically filled in for you and used. |
