diff options
author | Jon Dufresne <jon.dufresne@gmail.com> | 2017-11-28 06:38:44 -0800 |
---|---|---|
committer | Jon Dufresne <jon.dufresne@gmail.com> | 2017-11-28 06:38:44 -0800 |
commit | c1d3948be90742560df6784e11706773c062c562 (patch) | |
tree | d69bab712ba76c7f86f602f26bc95fd51ddd93aa /doc | |
parent | 914ccbacb5a21bd1f7f0bbdc32b01d73bea6dd4e (diff) | |
download | psycopg2-c1d3948be90742560df6784e11706773c062c562.tar.gz |
Update documentation to reflect JSON import behavior
The docs don't need to describe what will happen on Python versions
before 2.6 as they are unsupported by psycopg2.
Should have been included in commit
d58844e5483483240f97537e9a77b4e79cea2ab3, but was missed.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/extras.rst | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/doc/src/extras.rst b/doc/src/extras.rst index cb8335b..1342f13 100644 --- a/doc/src/extras.rst +++ b/doc/src/extras.rst @@ -539,17 +539,13 @@ fields to JSON) you can use the `register_json()` function. .. __: http://people.planetpostgresql.org/andrew/index.php?/archives/255-JSON-for-PG-9.2-...-and-now-for-9.1!.html -The Python library used by default to convert Python objects to JSON and to -parse data from the database depends on the language version: with Python 2.6 -and following the :py:mod:`json` module from the standard library is used; -with previous versions the `simplejson`_ module is used if available. Note -that the last `!simplejson` version supporting Python 2.4 is the 2.0.9. +The Python :py:mod:`json` module is used by default to convert Python objects +to JSON and to parse data from the database. .. _JSON: http://www.json.org/ .. |pgjson| replace:: :sql:`json` .. |jsonb| replace:: :sql:`jsonb` .. _pgjson: http://www.postgresql.org/docs/current/static/datatype-json.html -.. _simplejson: http://pypi.python.org/pypi/simplejson/ In order to pass a Python object to the database as query argument you can use the `Json` adapter:: |