Skip to content

Commit 3180ee7

Browse files
doc: describe tarantool module API
Update core module docstring and autodoc parameters. Part of #67
1 parent 4f5ca93 commit 3180ee7

File tree

3 files changed

+47
-14
lines changed

3 files changed

+47
-14
lines changed

Diff for: CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
139139
The only reason of this bump is various vulnerability fixes,
140140
msgpack>=0.4.0 and msgpack-python==0.4.0 are still supported.
141141
- Change documentation HTML theme (#67).
142+
- Update API documentation strings (#67).
142143

143144
### Fixed
144145

Diff for: doc/api/module-tarantool.rst

-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@ module :py:mod:`tarantool`
22
==========================
33

44
.. automodule:: tarantool
5-
:members:
6-
:undoc-members:

Diff for: tarantool/__init__.py

+46-12
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,40 @@ def connect(host="localhost", port=33013, user=None, password=None,
4949
ssl_cert_file=DEFAULT_SSL_CERT_FILE,
5050
ssl_ca_file=DEFAULT_SSL_CA_FILE,
5151
ssl_ciphers=DEFAULT_SSL_CIPHERS):
52-
'''
52+
"""
5353
Create a connection to the Tarantool server.
5454
55-
:param str host: Server hostname or IP-address
56-
:param int port: Server port
55+
:param host: Refer to :paramref:`~tarantool.Connection.params.host`.
5756
58-
:rtype: :class:`~tarantool.connection.Connection`
57+
:param port: Refer to :paramref:`~tarantool.Connection.params.port`.
5958
60-
:raise: `NetworkError`
61-
'''
59+
:param user: Refer to :paramref:`~tarantool.Connection.params.user`.
60+
61+
:param password: Refer to
62+
:paramref:`~tarantool.Connection.params.password`.
63+
64+
:param encoding: Refer to
65+
:paramref:`~tarantool.Connection.params.encoding`.
66+
67+
:param transport: Refer to
68+
:paramref:`~tarantool.Connection.params.transport`.
69+
70+
:param ssl_key_file: Refer to
71+
:paramref:`~tarantool.Connection.params.ssl_key_file`.
72+
73+
:param ssl_cert_file: Refer to
74+
:paramref:`~tarantool.Connection.params.ssl_cert_file`.
75+
76+
:param ssl_ca_file: Refer to
77+
:paramref:`~tarantool.Connection.params.ssl_ca_file`.
78+
79+
:param ssl_ciphers: Refer to
80+
:paramref:`~tarantool.Connection.params.ssl_ciphers`.
81+
82+
:rtype: :class:`~tarantool.Connection`
83+
84+
:raise: :class:`~tarantool.Connection` exceptions
85+
"""
6286

6387
return Connection(host, port,
6488
user=user,
@@ -77,15 +101,25 @@ def connect(host="localhost", port=33013, user=None, password=None,
77101

78102
def connectmesh(addrs=({'host': 'localhost', 'port': 3301},), user=None,
79103
password=None, encoding=ENCODING_DEFAULT):
80-
'''
81-
Create a connection to a mesh of Tarantool servers.
104+
"""
105+
Create a connection to a cluster of Tarantool servers.
106+
107+
:param addrs: Refer to
108+
:paramref:`~tarantool.MeshConnection.params.addrs`.
109+
110+
:param user: Refer to
111+
:paramref:`~tarantool.MeshConnection.params.user`.
112+
113+
:param password: Refer to
114+
:paramref:`~tarantool.MeshConnection.params.password`.
82115
83-
:param list addrs: List of maps: {'host':(HOSTNAME|IP_ADDR), 'port':PORT}.
116+
:param encoding: Refer to
117+
:paramref:`~tarantool.MeshConnection.params.encoding`.
84118
85-
:rtype: :class:`~tarantool.mesh_connection.MeshConnection`
119+
:rtype: :class:`~tarantool.MeshConnection`
86120
87-
:raise: `NetworkError`
88-
'''
121+
:raise: :class:`~tarantool.MeshConnection` exceptions
122+
"""
89123

90124
return MeshConnection(addrs=addrs,
91125
user=user,

0 commit comments

Comments
 (0)