This commit is contained in:
raimu 2014-04-11 22:40:21 +02:00
parent d4b3d16c14
commit fbda3f94ba
2 changed files with 2 additions and 2 deletions

View file

@ -119,7 +119,7 @@ def dumps(obj, **kwargs):
This function can return ``unicode`` strings or ascii-only bytestrings by This function can return ``unicode`` strings or ascii-only bytestrings by
default which coerce into unicode strings automatically. That behavior by default which coerce into unicode strings automatically. That behavior by
default is controlled by the ``JSON_AS_ASCII`` configuration variable default is controlled by the ``JSON_AS_ASCII`` configuration variable
and can be overriden by the simplejson ``ensure_ascii`` parameter. and can be overridden by the simplejson ``ensure_ascii`` parameter.
""" """
_dump_arg_defaults(kwargs) _dump_arg_defaults(kwargs)
encoding = kwargs.pop('encoding', None) encoding = kwargs.pop('encoding', None)

View file

@ -127,7 +127,7 @@ class Request(RequestBase):
parsing fails the :meth:`on_json_loading_failed` method on the parsing fails the :meth:`on_json_loading_failed` method on the
request object will be invoked. By default this function will request object will be invoked. By default this function will
only load the json data if the mimetype is ``application/json`` only load the json data if the mimetype is ``application/json``
but this can be overriden by the `force` parameter. but this can be overridden by the `force` parameter.
:param force: if set to `True` the mimetype is ignored. :param force: if set to `True` the mimetype is ignored.
:param silent: if set to `True` this method will fail silently :param silent: if set to `True` this method will fail silently