diff options
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/conf.py | 2 | ||||
| -rw-r--r-- | doc/src/extras.rst | 31 | ||||
| -rw-r--r-- | doc/src/usage.rst | 5 |
3 files changed, 23 insertions, 15 deletions
diff --git a/doc/src/conf.py b/doc/src/conf.py index 94ffa34..22c5c46 100644 --- a/doc/src/conf.py +++ b/doc/src/conf.py @@ -62,7 +62,7 @@ except ImportError: intersphinx_mapping = { 'py': ('http://docs.python.org/', None), - 'py3': ('http://docs.python.org/3.2', None), + 'py3': ('http://docs.python.org/3.4', None), } # Pattern to generate links to the bug tracker diff --git a/doc/src/extras.rst b/doc/src/extras.rst index cf871af..d33b8ee 100644 --- a/doc/src/extras.rst +++ b/doc/src/extras.rst @@ -933,18 +933,27 @@ UUID data type pair: CIDR; Data types pair: MACADDR; Data types -Networking data type -^^^^^^^^^^^^^^^^^^^^ +.. _adapt-network: + +Networking data types +^^^^^^^^^^^^^^^^^^^^^ -Psycopg casts the PostgreSQL networking data types (:sql:`inet`, :sql:`cidr`, -:sql:`macaddr`) into ordinary strings. However their array are detected as -arrays and directly cast into lists. +By default Psycopg casts the PostgreSQL networking data types (:sql:`inet`, +:sql:`cidr`, :sql:`macaddr`) into ordinary strings; array of such types are +converted into lists of strings. .. versionchanged:: 2.7 - in previous version array of networking types were not treated as arrays + in previous version array of networking types were not treated as arrays. + +.. autofunction:: register_ipaddress + .. autofunction:: register_inet + .. deprecated:: 2.7 + this function will not receive further development and disappear in + future versions. + .. doctest:: >>> psycopg2.extras.register_inet() @@ -957,16 +966,12 @@ arrays and directly cast into lists. >>> cur.fetchone()[0].addr '192.168.0.1/24' -.. deprecated:: 2.7 - this function will not receive further development and disappear in future - versions - .. autoclass:: Inet -.. deprecated:: 2.7 - this object will not receive further development and disappear in future - versions + .. deprecated:: 2.7 + this object will not receive further development and may disappear in + future versions. .. index:: diff --git a/doc/src/usage.rst b/doc/src/usage.rst index 3b42aeb..e768f37 100644 --- a/doc/src/usage.rst +++ b/doc/src/usage.rst @@ -264,7 +264,10 @@ types: +--------------------+-------------------------+--------------------------+ | Anything\ |tm| | :sql:`json` | :ref:`adapt-json` | +--------------------+-------------------------+--------------------------+ - | `uuid` | :sql:`uuid` | :ref:`adapt-uuid` | + | `~uuid.UUID` | :sql:`uuid` | :ref:`adapt-uuid` | + +--------------------+-------------------------+--------------------------+ + | `ipaddress` | | :sql:`inet` | :ref:`adapt-network` | + | objects | | :sql:`cidr` | | +--------------------+-------------------------+--------------------------+ .. |tm| unicode:: U+2122 |