diff options
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/conf.py | 4 | ||||
| -rw-r--r-- | doc/src/cursor.rst | 18 | ||||
| -rw-r--r-- | doc/src/faq.rst | 2 |
3 files changed, 15 insertions, 9 deletions
diff --git a/doc/src/conf.py b/doc/src/conf.py index 22c5c46..a918c08 100644 --- a/doc/src/conf.py +++ b/doc/src/conf.py @@ -61,8 +61,8 @@ except ImportError: release = version intersphinx_mapping = { - 'py': ('http://docs.python.org/', None), - 'py3': ('http://docs.python.org/3.4', None), + 'py': ('http://docs.python.org/2', None), + 'py3': ('http://docs.python.org/3', None), } # Pattern to generate links to the bug tracker diff --git a/doc/src/cursor.rst b/doc/src/cursor.rst index 45e6278..aee6b46 100644 --- a/doc/src/cursor.rst +++ b/doc/src/cursor.rst @@ -201,13 +201,19 @@ The ``cursor`` class Call a stored database procedure with the given name. The sequence of parameters must contain one entry for each argument that the procedure - expects. The result of the call is returned as modified copy of the - input sequence. Input parameters are left untouched, output and - input/output parameters replaced with possibly new values. - - The procedure may also provide a result set as output. This must then - be made available through the standard |fetch*|_ methods. + expects. Overloaded procedures are supported. Named parameters can be + used by supplying the parameters as a dictionary. + + This function is, at present, not DBAPI-compliant. The return value is + supposed to consist of the sequence of parameters with modified output + and input/output parameters. In future versions, the DBAPI-compliant + return value may be implemented, but for now the function returns None. + + The procedure may provide a result set as output. This is then made + available through the standard |fetch*|_ methods. + .. versionchanged:: 2.7 + added support for named arguments. .. method:: mogrify(operation [, parameters]) diff --git a/doc/src/faq.rst b/doc/src/faq.rst index d063666..89d8a63 100644 --- a/doc/src/faq.rst +++ b/doc/src/faq.rst @@ -241,7 +241,7 @@ How do I interrupt a long-running query in an interactive shell? .. code-block:: pycon - >>> psycopg2.extensions.set_wait_callback(psycopg2.extensions.wait_select) + >>> psycopg2.extensions.set_wait_callback(psycopg2.extras.wait_select) >>> cnn = psycopg2.connect('') >>> cur = cnn.cursor() >>> cur.execute("select pg_sleep(10)") |