summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2015-02-06 01:05:12 -0600
committerMichael Merickel <michael@merickel.org>2015-02-06 01:05:12 -0600
commit4b13e0dfcdf47b3ef9befd529c0d78af8a2712d5 (patch)
tree0642031c665a2da5e6190db20fb0291bdb4d2781 /CHANGES.txt
parent04ef03eb425945a4e3d15f7a86a13f7e7be68948 (diff)
parent1ef35b7194ad744f23cf2881bbf881690d680c83 (diff)
downloadpyramid-4b13e0dfcdf47b3ef9befd529c0d78af8a2712d5.tar.gz
pyramid-4b13e0dfcdf47b3ef9befd529c0d78af8a2712d5.tar.bz2
pyramid-4b13e0dfcdf47b3ef9befd529c0d78af8a2712d5.zip
Merge pull request #1561 from Pylons/fix.jsonp-without-request
fix #1535 by avoiding the request if it's None
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 832a2c216..b334f5258 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -120,6 +120,11 @@ Bug Fixes
- Fix route generation for static view asset specifications having no path.
See https://github.com/Pylons/pyramid/pull/1377
+- Allow the ``pyramid.renderers.JSONP`` renderer to work even if there is no
+ valid request object. In this case it will not wrap the object in a
+ callback and thus behave just like the ``pyramid.renderers.JSON` renderer.
+ See https://github.com/Pylons/pyramid/pull/1561
+
Deprecations
------------