diff options
| author | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2016-10-11 04:55:09 +0100 |
|---|---|---|
| committer | Daniele Varrazzo <daniele.varrazzo@gmail.com> | 2016-10-11 04:55:09 +0100 |
| commit | 51aa166d5219bf6bcda1f68f33399c930113a1f1 (patch) | |
| tree | d9504de513e795a5132db605440c76407ba42906 /doc/src | |
| parent | 05627ac0f9e519c52014185b48a782f8669e6843 (diff) | |
| parent | 643ba70bad0f19a68c06ec95de2691c28e060e48 (diff) | |
| download | psycopg2-51aa166d5219bf6bcda1f68f33399c930113a1f1.tar.gz | |
Merge branch 'networking-improvement'
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/conf.py | 2 | ||||
| -rw-r--r-- | doc/src/extras.rst | 30 | ||||
| -rw-r--r-- | doc/src/usage.rst | 5 |
3 files changed, 29 insertions, 8 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 78e96ef..d33b8ee 100644 --- a/doc/src/extras.rst +++ b/doc/src/extras.rst @@ -930,12 +930,29 @@ UUID data type .. index:: pair: INET; Data types + pair: CIDR; Data types + pair: MACADDR; Data types -:sql:`inet` data type -^^^^^^^^^^^^^^^^^^^^^^ +.. _adapt-network: + +Networking data types +^^^^^^^^^^^^^^^^^^^^^ + +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. + +.. autofunction:: register_ipaddress -.. versionadded:: 2.0.9 -.. versionchanged:: 2.4.5 added inet array support. + +.. autofunction:: register_inet + + .. deprecated:: 2.7 + this function will not receive further development and disappear in + future versions. .. doctest:: @@ -950,10 +967,11 @@ UUID data type '192.168.0.1/24' -.. autofunction:: register_inet - .. autoclass:: Inet + .. 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 |