[pytango] 477/483: Fixes #690

[Sandor Bodo-Merle]

This is an automated email from the git hooks/post-receive script.

sbodomerle-guest pushed a commit to annotated tag bliss_8.10
in repository pytango.

commit 1bb0aa6e23d09336e5e73ba83f6ab3e93d51079e
Author: coutinho <coutinho at esrf.fr>
Date:   Mon May 11 10:13:47 2015 +0200

    Fixes #690
---
 doc/revision.rst              | 6 +++++-
 src/boost/python/attr_data.py | 2 +-
 src/boost/python/server.py    | 7 ++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/doc/revision.rst b/doc/revision.rst
index 1ad8aac..a9ccad8 100644
--- a/doc/revision.rst
+++ b/doc/revision.rst
@@ -85,7 +85,7 @@ Document revisions
 +----------+----------------------------------------------------------------------------------+-----------------------------------------------------+-----------------------+
 | 05/02/15 | `8.22 <http://www.tango-controls.org/static/PyTango/v816/doc/html/index.html>`_  | Update to PyTango 8.1.6                             | T\. Coutinho          |
 +----------+----------------------------------------------------------------------------------+-----------------------------------------------------+-----------------------+
-| --/04/15 | `8.23 <http://www.tango-controls.org/static/PyTango/v817/doc/html/index.html>`_  | Update to PyTango 8.1.6                             | T\. Coutinho          |
+| --/05/15 | `8.23 <http://www.tango-controls.org/static/PyTango/v817/doc/html/index.html>`_  | Update to PyTango 8.1.7                             | T\. Coutinho          |
 +----------+----------------------------------------------------------------------------------+-----------------------------------------------------+-----------------------+
 
 .. _pytango-version-history:
@@ -99,6 +99,10 @@ Version history
 | 8.1.7    | Features:                                                                                                                                                             |
 |          |                                                                                                                                                                       |
 |          |     - `110:  device property with auto update in database <https://sourceforge.net/p/tango-cs/feature-requests/110>`_                                                 |
+|          |                                                                                                                                                                       |
+|          | Bug fixes:                                                                                                                                                            |
+|          |                                                                                                                                                                       |
+|          |     - `690: Description attribute property <https://sourceforge.net/p/tango-cs/bugs/690/>`_                                                                           |
 +----------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 8.1.6    | Bug fixes:                                                                                                                                                            |
 |          |                                                                                                                                                                       |
diff --git a/src/boost/python/attr_data.py b/src/boost/python/attr_data.py
index 5812e04..7e806bf 100644
--- a/src/boost/python/attr_data.py
+++ b/src/boost/python/attr_data.py
@@ -141,7 +141,7 @@ class AttrData(object):
         p = UserDefaultAttrProp()
 
         doc = extra_info.pop('doc', None)
-        if 'doc' is not None:
+        if doc is not None:
             extra_info['description'] = doc
         
         for k, v in extra_info.items():
diff --git a/src/boost/python/server.py b/src/boost/python/server.py
index 2ca26ff..547215a 100644
--- a/src/boost/python/server.py
+++ b/src/boost/python/server.py
@@ -562,8 +562,8 @@ class attribute(AttrData):
             def current(self, current):
                 self._current = current
 
-    In this second format, defining the `write` implies setting the
-    attribute access to READ_WRITE.
+    In this second format, defining the `write` implicitly sets the attribute
+    access to READ_WRITE.
 
     .. versionadded:: 8.1.7
         added green_mode, read_green_mode and write_green_mode options
@@ -581,7 +581,8 @@ class attribute(AttrData):
             if inspect.isroutine(fget):
                 self.fget = fget
                 if 'doc' not in kwargs and 'description' not in kwargs:
-                    kwargs['doc'] = fget.__doc__
+                    if fget.__doc__ is not None:
+                        kwargs['doc'] = fget.__doc__
             kwargs['fget'] = fget
 
         super(attribute, self).__init__(name, class_name)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git