diff options
| author | Chris McDonough <chrism@plope.com> | 2015-02-17 19:37:52 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-02-17 19:37:52 -0500 |
| commit | d4333972ad328f06262ba55ef2a3d24963da95b0 (patch) | |
| tree | c208aafc07a03934307019120910c3a576982978 /CHANGES.txt | |
| parent | b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f (diff) | |
| parent | 4dacb8c24efe98cb14b3ef89f6c9a8b2fd196790 (diff) | |
| download | pyramid-d4333972ad328f06262ba55ef2a3d24963da95b0.tar.gz pyramid-d4333972ad328f06262ba55ef2a3d24963da95b0.tar.bz2 pyramid-d4333972ad328f06262ba55ef2a3d24963da95b0.zip | |
fix merge conflicts
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 6c21e7298..1c82e5f27 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,12 +10,26 @@ Features or group them for improved conflict detection. See https://github.com/Pylons/pyramid/pull/1513 +- Add ``pyramid.request.apply_request_extensions`` function which can be + used in testing to apply any request extensions configured via + ``config.add_request_method``. Previously it was only possible to test + the extensions by going through Pyramid's router. + See https://github.com/Pylons/pyramid/pull/1581 + +- pcreate when run without a scaffold argument will now print information on + the missing flag, as well as a list of available scaffolds. + See https://github.com/Pylons/pyramid/pull/1566 and + https://github.com/Pylons/pyramid/issues/1297 + - Added support / testing for 'pypy3' under Tox and Travis. See https://github.com/Pylons/pyramid/pull/1469 - Cache busting for static resources has been added and is available via a new argument to ``pyramid.config.Configurator.add_static_view``: ``cachebust``. - See https://github.com/Pylons/pyramid/pull/1380 + Core APIs are shipped for both cache busting via query strings and + path segments and may be extended to fit into custom asset pipelines. + See https://github.com/Pylons/pyramid/pull/1380 and + https://github.com/Pylons/pyramid/pull/1583 - Add ``pyramid.config.Configurator.root_package`` attribute and init parameter to assist with includeable packages that wish to resolve @@ -89,6 +103,10 @@ Features Bug Fixes --------- +- Work around an issue where ``pserve --reload`` would leave terminal echo + disabled if it reloaded during a pdb session. + See https://github.com/Pylons/pyramid/pull/1577 + - ``pyramid.wsgi.wsgiapp`` and ``pyramid.wsgi.wsgiapp2`` now raise ``ValueError`` when accidentally passed ``None``. See https://github.com/Pylons/pyramid/pull/1320 @@ -131,6 +149,12 @@ Bug Fixes callback and thus behave just like the ``pyramid.renderers.JSON` renderer. See https://github.com/Pylons/pyramid/pull/1561 +- Prevent "parameters to load are deprecated" ``DeprecationWarning`` + from setuptools>=11.3. See https://github.com/Pylons/pyramid/pull/1541 + +- Avoiding timing attacks against CSRF tokens. + See https://github.com/Pylons/pyramid/pull/1574 + Deprecations ------------ |