Skip to content

Commit 5627cba

Browse files
committed
Documentation, typing info. Prepare RTD
1 parent 4e5ef30 commit 5627cba

File tree

6 files changed

+134
-10
lines changed

6 files changed

+134
-10
lines changed

README.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ Advanced descriptors
77
:target: https://ci.appveyor.com/project/penguinolog/advanced-descriptors
88
.. image:: https://coveralls.io/repos/github/penguinolog/advanced-descriptors/badge.svg?branch=master
99
:target: https://coveralls.io/github/penguinolog/advanced-descriptors?branch=master
10+
.. image:: https://readthedocs.org/projects/advanced-descriptors/badge/?version=latest
11+
:target: http://advanced-descriptors.readthedocs.io/
12+
:alt: Documentation Status
1013
.. image:: https://img.shields.io/pypi/v/advanced-descriptors.svg
1114
:target: https://pypi.python.org/pypi/advanced-descriptors
1215
.. image:: https://img.shields.io/pypi/pyversions/advanced-descriptors.svg

advanced_descriptors/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
'AdvancedProperty',
2222
)
2323

24-
__version__ = '0.5.5'
24+
__version__ = '0.5.6'
2525
__author__ = "Alexey Stepanov"
2626
__author_email__ = 'penguinolog@gmail.com'
2727
__url__ = 'https://github.com/penguinolog/advanced-descriptors'

advanced_descriptors/advanced_property.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def __init__(
159159
:type fcget:
160160
typing.Optional[typing.Callable[[typing.Any, ], typing.Any]]
161161
162-
.. note: doc argument is not supported due to class wide getter usage.
162+
.. note:: doc argument is not supported due to class wide getter usage.
163163
"""
164164
self.__fget = fget
165165
self.__fset = fset
@@ -210,15 +210,15 @@ def __delete__(self, instance): # type: (...) -> None
210210
return self.__fdel(instance)
211211

212212
@property
213-
def fget(self): # type: (AdvancedProperty) -> GetterType
213+
def fget(self): # type: () -> GetterType
214214
"""Getter instance.
215215
216216
:rtype: typing.Optional[typing.Callable[[typing.Any, ], typing.Any]]
217217
"""
218218
return self.__fget
219219

220220
@property
221-
def fset(self): # type: (AdvancedProperty) -> SetterType
221+
def fset(self): # type: () -> SetterType
222222
"""Setter instance.
223223
224224
:rtype:
@@ -227,15 +227,15 @@ def fset(self): # type: (AdvancedProperty) -> SetterType
227227
return self.__fset
228228

229229
@property
230-
def fdel(self): # type: (AdvancedProperty) -> DeleterType
230+
def fdel(self): # type: () -> DeleterType
231231
"""Deleter instance.
232232
233233
:rtype: typing.Optional[typing.Callable[[typing.Any, ], None]]
234234
"""
235235
return self.__fdel
236236

237237
@property
238-
def fcget(self): # type: (AdvancedProperty) -> GetterType
238+
def fcget(self): # type: () -> GetterType
239239
"""Class wide getter instance.
240240
241241
:rtype: typing.Optional[typing.Callable[[typing.Any, ], typing.Any]]
@@ -251,7 +251,7 @@ def getter(
251251
:param fget: new normal getter.
252252
:type fget:
253253
typing.Optional[typing.Callable[[typing.Any, ], typing.Any]]
254-
:rtype: GetterType
254+
:rtype: AdvancedProperty
255255
"""
256256
self.__fget = fget
257257
return self
@@ -265,7 +265,7 @@ def setter(
265265
:param fset: new setter.
266266
:type fset:
267267
typing.Optional[typing.Callable[[typing.Any, typing.Any], None]]
268-
:rtype: GetterType
268+
:rtype: AdvancedProperty
269269
"""
270270
self.__fset = fset
271271
return self
@@ -278,7 +278,7 @@ def deleter(
278278
279279
:param fdel: New deleter.
280280
:type fdel: typing.Optional[typing.Callable[[typing.Any, ], None]]
281-
:rtype: GetterType
281+
:rtype: AdvancedProperty
282282
"""
283283
self.__fdel = fdel
284284
return self
@@ -292,7 +292,7 @@ def cgetter(
292292
:param fcget: new class-wide getter.
293293
:type fcget:
294294
typing.Optional[typing.Callable[[typing.Any, ], typing.Any]]
295-
:rtype: GetterType
295+
:rtype: AdvancedProperty
296296
"""
297297
self.__fcget = fcget
298298
return self

doc/source/advanced_property.rst

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
.. AdvancedProperty
2+
3+
API: AdvancedProperty
4+
========================
5+
6+
.. py:module:: advanced_descriptors
7+
.. py:currentmodule:: advanced_descriptors
8+
9+
10+
.. py:class:: AdvancedProperty(fget=None, fset=None, fdel=None, fcget=None, )
11+
12+
Advanced property main entry point.
13+
14+
:param fget: normal getter.
15+
:type fget: ``typing.Optional[typing.Callable[[typing.Any, ], typing.Any]]``
16+
:param fset: normal setter.
17+
:type fset: ``typing.Optional[typing.Callable[[typing.Any, typing.Any], None]]``
18+
:param fdel: normal deleter.
19+
:type fdel: ``typing.Optional[typing.Callable[[typing.Any, ], None]]``
20+
:param fcget: class getter. Used as normal, if normal is None.
21+
:type fcget: ``typing.Optional[typing.Callable[[typing.Any, ], typing.Any]]``
22+
23+
.. note:: doc argument is not supported due to class wide getter usage.
24+
25+
.. py:method:: getter(fget)
26+
27+
Descriptor to change the getter on a property.
28+
29+
:param fget: new normal getter.
30+
:type fget: ``typing.Optional[typing.Callable[[typing.Any, ], typing.Any]]``
31+
:rtype: ``AdvancedProperty``
32+
33+
.. py:method:: setter(fset)
34+
35+
Descriptor to change the setter on a property.
36+
37+
:param fset: new setter.
38+
:type fset: ``typing.Optional[typing.Callable[[typing.Any, typing.Any], None]]``
39+
:rtype: ``AdvancedProperty``
40+
41+
.. py:method:: deleter(fdel)
42+
43+
Descriptor to change the deleter on a property.
44+
45+
:param fdel: New deleter.
46+
:type fdel: ``typing.Optional[typing.Callable[[typing.Any, ], None]]``
47+
:rtype: ``AdvancedProperty``
48+
49+
.. py:method:: cgetter(fcget)
50+
51+
Descriptor to change the class wide getter on a property.
52+
53+
:param fcget: new class-wide getter.
54+
:type fcget: ``typing.Optional[typing.Callable[[typing.Any, ], typing.Any]]``
55+
:rtype: ``AdvancedProperty``
56+
57+
.. py:attribute:: fget
58+
59+
``typing.Optional[typing.Callable[[typing.Any, ], typing.Any]]``
60+
Getter instance.
61+
62+
.. py:attribute:: fset
63+
64+
``typing.Optional[typing.Callable[[typing.Any, typing.Any], None]]``
65+
Setter instance.
66+
67+
.. py:attribute:: fdel
68+
69+
``typing.Optional[typing.Callable[[typing.Any, ], None]]``
70+
Deleter instance.
71+
72+
.. py:attribute:: fcget
73+
74+
``typing.Optional[typing.Callable[[typing.Any, ], typing.Any]]``
75+
Class wide getter instance.

doc/source/index.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ Contents:
1010
.. toctree::
1111
:maxdepth: 2
1212

13+
separate_classmethod
14+
advanced_property
15+
1316
Indices and tables
1417
==================
1518

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
.. SeparateClassMethod
2+
3+
API: SeparateClassMethod
4+
========================
5+
6+
.. py:module:: advanced_descriptors
7+
.. py:currentmodule:: advanced_descriptors
8+
9+
10+
.. py:class:: SeparateClassMethod(imeth=None, cmeth=None, )
11+
12+
Separate class method and instance methods.
13+
14+
:param imeth: Instance method
15+
:type imeth: ``typing.Optional[typing.Callable[..., typing.Any]]``
16+
:param cmeth: Class method
17+
:type cmeth: ``typing.Optional[typing.Callable[..., typing.Any]]``
18+
19+
.. py:method:: instance_method(imeth)
20+
21+
Descriptor to change instance method.
22+
23+
:param imeth: New instance method.
24+
:type imeth: ``typing.Optional[typing.Callable[..., typing.Any]]``
25+
:rtype: ``SeparateClassMethod``
26+
27+
.. py:method:: class_method(cmeth)
28+
29+
Descriptor to change class method.
30+
31+
:type cmeth: New class method.
32+
:type cmeth: ``typing.Optional[typing.Callable[..., typing.Any]]``
33+
:rtype: ``SeparateClassMethod``
34+
35+
.. py:attribute:: imeth
36+
37+
``typing.Optional[typing.Callable[..., typing.Any]]``
38+
Instance method instance.
39+
40+
.. py:attribute:: cmeth
41+
42+
``typing.Optional[typing.Callable[..., typing.Any]]``
43+
Class method instance.

0 commit comments

Comments
 (0)