diff options
| author | Steve Piercy <web@stevepiercy.com> | 2018-10-05 02:33:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-05 02:33:18 -0700 |
| commit | 086198b5db7dcb86c2b4edbc5d3610dcade0332a (patch) | |
| tree | 1af84e37e9ad7bdb445786a0345822dcdfd851f0 /docs/api | |
| parent | 2fa1e218ea6b9a6d5c3f8193ea27d0fc44b8964a (diff) | |
| parent | f6becd23966248fb7fc4db218258be4364902f8f (diff) | |
| download | pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.gz pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.tar.bz2 pyramid-086198b5db7dcb86c2b4edbc5d3610dcade0332a.zip | |
Merge branch 'master' into one_cc
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/config.rst | 1 | ||||
| -rw-r--r-- | docs/api/request.rst | 3 | ||||
| -rw-r--r-- | docs/api/session.rst | 8 |
3 files changed, 3 insertions, 9 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index a785b64ad..b2cd53a68 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -44,7 +44,6 @@ :methodcategory:`Extending the Request Object` .. automethod:: add_request_method - .. automethod:: set_request_property :methodcategory:`Using I18N` diff --git a/docs/api/request.rst b/docs/api/request.rst index b5700f4ab..0c169adaf 100644 --- a/docs/api/request.rst +++ b/docs/api/request.rst @@ -228,8 +228,7 @@ handed. - sets request extensions (such as those added via - :meth:`~pyramid.config.Configurator.add_request_method` or - :meth:`~pyramid.config.Configurator.set_request_property`) on the + :meth:`~pyramid.config.Configurator.add_request_method`) on the request it's passed. - causes a :class:`~pyramid.events.NewRequest` event to be sent at the diff --git a/docs/api/session.rst b/docs/api/session.rst index 53bae7c52..d0cb112ec 100644 --- a/docs/api/session.rst +++ b/docs/api/session.rst @@ -5,15 +5,11 @@ .. automodule:: pyramid.session - .. autofunction:: signed_serialize - - .. autofunction:: signed_deserialize - .. autofunction:: SignedCookieSessionFactory - .. autofunction:: UnencryptedCookieSessionFactoryConfig - .. autofunction:: BaseCookieSessionFactory .. autoclass:: PickleSerializer + .. autoclass:: JSONSerializer + |