[pytango] 09/483: fixes #3284434
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:19 UTC 2017
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 19a7ea3688b2ba077d6de1a9fdec9d91c8753653
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date: Mon Apr 11 18:02:18 2011 +0000
fixes #3284434
git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@16498 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
PyTango/api_util.py | 20 ++++----
PyTango/base_types.py | 59 +++++++++++++++++++++++-
PyTango/db.py | 109 +++++++++++++++++++++++++++-----------------
PyTango/device_proxy.py | 22 +++++----
PyTango/device_server.py | 14 +++---
PyTango/exception.py | 4 +-
PyTango/group_element.py | 13 +++---
PyTango/pyutil.py | 34 +++++++-------
doc/client/group.rst | 1 +
doc/revision.rst | 3 +-
setup.py | 2 +-
src/device_info.cpp | 9 +---
src/locker_info.cpp | 13 +-----
src/periodic_event_info.cpp | 7 +--
src/precompiled_header.hpp | 2 -
15 files changed, 189 insertions(+), 123 deletions(-)
diff --git a/PyTango/api_util.py b/PyTango/api_util.py
index 11369db..770343e 100644
--- a/PyTango/api_util.py
+++ b/PyTango/api_util.py
@@ -47,7 +47,8 @@ def __doc_api_util():
import PyTango
apiutil = PyTango.ApiUtil.instance()
- .. versionadded:: 7.1.3"""
+ New in PyTango 7.1.3
+ """
document_static_method(ApiUtil, "instance", """
instance() -> ApiUtil
@@ -57,7 +58,7 @@ def __doc_api_util():
Parameters : None
Return : (ApiUtil) a reference to the ApiUtil singleton object.
- .. versionadded:: 7.1.3
+ New in PyTango 7.1.3
""" )
document_method(ApiUtil, "pending_asynch_call", """
@@ -75,7 +76,7 @@ def __doc_api_util():
Return : (int) the number of pending requests for the given type
- .. versionadded:: 7.1.3
+ New in PyTango 7.1.3
""" )
document_method(ApiUtil, "get_asynch_replies", """
@@ -90,9 +91,9 @@ def __doc_api_util():
Return : None
Throws : None, all errors are reported using the err and errors fields
- of the parameter passed to the callback method.
+ of the parameter passed to the callback method.
- .. versionadded:: 7.1.3
+ New in PyTango 7.1.3
get_asynch_replies(self) -> None
@@ -109,9 +110,10 @@ def __doc_api_util():
Return : None
Throws : AsynReplyNotArrived. All other errors are reported using
- the err and errors fields of the object passed to the callback methods.
+ the err and errors fields of the object passed to the
+ callback methods.
- .. versionadded:: 7.1.3
+ New in PyTango 7.1.3
""" )
document_method(ApiUtil, "set_asynch_cb_sub_model", """
@@ -127,7 +129,7 @@ def __doc_api_util():
- model : (cb_sub_model) the callback sub-model
Return : None
- .. versionadded:: 7.1.3
+ New in PyTango 7.1.3
""" )
document_method(ApiUtil, "get_asynch_cb_sub_model", """
@@ -138,7 +140,7 @@ def __doc_api_util():
Parameters : None
Return : (cb_sub_model) the active asynchronous callback sub-model.
- .. versionadded:: 7.1.3
+ New in PyTango 7.1.3
""" )
def init(doc=True):
diff --git a/PyTango/base_types.py b/PyTango/base_types.py
index 1a533ce..65b98ac 100644
--- a/PyTango/base_types.py
+++ b/PyTango/base_types.py
@@ -100,6 +100,7 @@ def __doc_base_types():
in all the cases.
Valid possible values are:
+
- Numpy : Value will be stored in [value, w_value]. If the
attribute is an scalar, they will contain a value. If it's
an SPECTRUM or IMAGE it will be exported as a numpy array.
@@ -382,13 +383,15 @@ def __doc_base_types():
ArchiveEventInfo.__doc__ = """
A structure containing available archiving event information for an attribute
with the folowing members:
+
- archive_rel_change : (str) relative change that will generate an event
- archive_abs_change : (str) absolute change that will generate an event
- extensions : (sequence<str>) extensions (currently not used)"""
EventData.__doc__ = """
This class is used to pass data to the callback method when an event
- is sent to the client. It contains the following public fields
+ is sent to the client. It contains the following public fields:
+
- device : (DeviceProxy) The DeviceProxy object on which the call was
executed.
- attr_name : (str) The attribute name
@@ -415,6 +418,7 @@ def __doc_base_types():
This class is used to pass data to the callback method when a
configuration event is sent to the client. It contains the
following public fields:
+
- device : (DeviceProxy) The DeviceProxy object on which the call was executed
- attr_name : (str) The attribute name
- event : (str) The event name
@@ -439,6 +443,7 @@ def __doc_base_types():
AttributeAlarmInfo.__doc__ = """
A structure containing available alarm information for an attribute
with the folowing members:
+
- min_alarm : (str) low alarm level
- max_alarm : (str) high alarm level
- min_warning : (str) low warning level
@@ -450,12 +455,14 @@ def __doc_base_types():
AttributeDimension.__doc__ = """
A structure containing x and y attribute data dimensions with
the following members:
+
- dim_x : (int) x dimension
- dim_y : (int) y dimension"""
AttributeEventInfo.__doc__ = """
A structure containing available event information for an attribute
with the folowing members:
+
- ch_event : (ChangeEventInfo) change event information
- per_event : (PeriodicEventInfo) periodic event information
- arch_event : (ArchiveEventInfo) archiving event information"""
@@ -463,6 +470,7 @@ def __doc_base_types():
DeviceAttributeConfig.__doc__ = """
A base structure containing available information for an attribute
with the following members:
+
- name : (str) attribute name
- writable : (AttrWriteType) write type (R, W, RW, R with W)
- data_format : (AttrDataFormat) data format (SCALAR, SPECTRUM, IMAGE)
@@ -485,9 +493,11 @@ def __doc_base_types():
AttributeInfo.__doc__ = """
A structure (inheriting from :class:`DeviceAttributeConfig`) containing
available information for an attribute with the following members:
+
- disp_level : (DispLevel) display level (OPERATOR, EXPERT)
Inherited members are:
+
- name : (str) attribute name
- writable : (AttrWriteType) write type (R, W, RW, R with W)
- data_format : (AttrDataFormat) data format (SCALAR, SPECTRUM, IMAGE)
@@ -510,11 +520,13 @@ def __doc_base_types():
AttributeInfoEx.__doc__ = """
A structure (inheriting from :class:`AttributeInfo`) containing
available information for an attribute with the following members:
+
- alarms : object containing alarm information (see AttributeAlarmInfo).
- events : object containing event information (see AttributeEventInfo).
- sys_extensions : StdStringVector
Inherited members are:
+
- name : (str) attribute name
- writable : (AttrWriteType) write type (R, W, RW, R with W)
- data_format : (AttrDataFormat) data format (SCALAR, SPECTRUM, IMAGE)
@@ -538,12 +550,21 @@ def __doc_base_types():
ChangeEventInfo.__doc__ = """
A structure containing available change event information for an attribute
with the folowing members:
+
- rel_change : (str) relative change that will generate an event
- abs_change : (str) absolute change that will generate an event
- extensions : (StdStringVector) extensions (currently not used)"""
+ PeriodicEventInfo.__doc__ = """
+ A structure containing available periodic event information for an attribute
+ with the folowing members:
+
+ - period : (str) event period
+ - extensions : (StdStringVector) extensions (currently not used)"""
+
DevCommandInfo.__doc__ = """
A device command info with the following members:
+
- cmd_name : (str) command name
- cmd_tag : command as binary value (for TACO)
- in_type : (CmdArgType) input type
@@ -555,9 +576,11 @@ def __doc_base_types():
CommandInfo.__doc__ = """
A device command info (inheriting from :class:`DevCommandInfo`) with the following members:
+
- disp_level : (DispLevel) command display level
Inherited members are (from :class:`DevCommandInfo`):
+
- cmd_name : (str) command name
- cmd_tag : (str) command as binary value (for TACO)
- in_type : (CmdArgType) input type
@@ -569,6 +592,7 @@ def __doc_base_types():
This class is used to pass data to the callback method when an
attribute data ready event is sent to the clien. It contains the
following public fields:
+
- device : (DeviceProxy) The DeviceProxy object on which the call was executed
- attr_name : (str) The attribute name
- event : (str) The event name
@@ -582,6 +606,36 @@ def __doc_base_types():
New in PyTango 7.0.0"""
+ DeviceInfo.__doc__ = """
+ A structure containing available information for a device with the"
+ following members:
+
+ - dev_class : (str) device class
+ - server_id : (str) server ID
+ - server_host : (str) host name
+ - server_version : (str) server version
+ - doc_url : (str) document url"""
+
+ LockerInfo.__doc__ = """
+ A structure with information about the locker with the folowing members:
+
+ - ll : (PyTango.LockerLanguage) the locker language
+ - li : (pid_t / UUID) the locker id
+ - locker_host : (str) the host
+ - locker_class : (str) the class
+
+ pid_t should be an int, UUID should be a tuple of four numbers.
+
+ New in PyTango 7.0.0"""
+
+ PollDevice.__doc__ = """
+ A structure containing PollDevice information with the folowing members:
+
+ - dev_name : (str) device name
+ - ind_list : (sequence<int>) index list
+
+ New in PyTango 7.0.0"""
+
document_method(DataReadyEventData, "get_date", """
get_date(self) -> TimeVal
@@ -594,7 +648,8 @@ def __doc_base_types():
""" )
TimeVal.__doc__ = """
- Time value structure with the following members
+ Time value structure with the following members:
+
- tv_sec : seconds
- tv_usec : microseconds
- tv_nsec : nanoseconds"""
diff --git a/PyTango/db.py b/PyTango/db.py
index f6ba22c..24685f5 100644
--- a/PyTango/db.py
+++ b/PyTango/db.py
@@ -236,9 +236,11 @@ def __Database__put_property(self, obj_name, value):
put_property(self, obj_name, value) -> None
Insert or update a list of properties for the specified object.
+
Parameters :
- obj_name : (str) object name
- value : can be one of the following:
+
1. DbDatum - single property data to be inserted
2. DbData - several property data to be inserted
3. sequence<DbDatum> - several property data to be inserted
@@ -260,20 +262,21 @@ def __Database__get_property(self, obj_name, value):
Parameters :
- obj_name : (str) object name
- value : can be one of the following:
+
1. str [in] - single property data to be fetched
2. DbDatum [in] - single property data to be fetched
3. DbData [in,out] - several property data to be fetched
- In this case (direct C++ API) the DbData will be filled with the
- property values
+ In this case (direct C++ API) the DbData will be filled with
+ the property values
4. sequence<str> [in] - several property data to be fetched
5. sequence<DbDatum> [in] - several property data to be fetched
6. dict<str, obj> [in,out] - keys are property names
- In this case the given dict values will be changed to contain the
- several property values
+ In this case the given dict values will be changed to contain
+ the several property values
Return : a dictionary which keys are the property names the value
- associated with each key being a a sequence of strings being the
- property value.
+ associated with each key being a a sequence of strings being
+ the property value.
Throws : ConnectionFailed, CommunicationFailed, DevFailed from device (DB_SQLError)"""
return __Database__generic_get_property(self, obj_name, value, self._get_property)
@@ -292,15 +295,16 @@ def __Database__delete_property(self, obj_name, value):
Parameters :
- obj_name : (str) object name
- value : can be one of the following:
+
1. str [in] - single property data to be deleted
2. DbDatum [in] - single property data to be deleted
3. DbData [in] - several property data to be deleted
4. sequence<string> [in]- several property data to be deleted
5. sequence<DbDatum> [in] - several property data to be deleted
6. dict<str, obj> [in] - keys are property names to be deleted
- (values are ignored)
+ (values are ignored)
7. dict<str, DbDatum> [in] - several DbDatum.name are property names
- to be deleted (keys are ignored)
+ to be deleted (keys are ignored)
Return : None
Throws : ConnectionFailed, CommunicationFailed, DevFailed from device (DB_SQLError)"""
@@ -315,16 +319,17 @@ def __Database__get_device_property(self, dev_name, value):
Parameters :
- dev_name : (str) object name
- value : can be one of the following:
+
1. str [in] - single property data to be fetched
2. DbDatum [in] - single property data to be fetched
3. DbData [in,out] - several property data to be fetched
- In this case (direct C++ API) the DbData will be filled with the
- property values
+ In this case (direct C++ API) the DbData will be filled with
+ the property values
4. sequence<str> [in] - several property data to be fetched
5. sequence<DbDatum> [in] - several property data to be fetched
6. dict<str, obj> [in,out] - keys are property names
- In this case the given dict values will be changed to contain the
- several property values
+ In this case the given dict values will be changed to contain
+ the several property values
Return : a dictionary which keys are the property names the value
associated with each key being a a sequence of strings being the
@@ -342,6 +347,7 @@ def __Database__put_device_property(self, dev_name, value):
Parameters :
- dev_name : (str) object name
- value : can be one of the following:
+
1. DbDatum - single property data to be inserted
2. DbData - several property data to be inserted
3. sequence<DbDatum> - several property data to be inserted
@@ -417,16 +423,17 @@ def __Database__get_device_attribute_property(self, dev_name, value):
Parameters :
- dev_name : (string) device name
- value : can be one of the following:
+
1. str [in] - single attribute properties to be fetched
2. DbDatum [in] - single attribute properties to be fetched
3. DbData [in,out] - several attribute properties to be fetched
- In this case (direct C++ API) the DbData will be filled with the property
- values
+ In this case (direct C++ API) the DbData will be filled with
+ the property values
4. sequence<str> [in] - several attribute properties to be fetched
5. sequence<DbDatum> [in] - several attribute properties to be fetched
6. dict<str, obj> [in,out] - keys are attribute names
- In this case the given dict values will be changed to contain the several
- attribute property values
+ In this case the given dict values will be changed to contain the
+ several attribute property values
Return : a dictionary which keys are the attribute names the
value associated with each key being a another
@@ -490,11 +497,13 @@ def __Database__put_device_attribute_property(self, dev_name, value):
Parameters :
- dev_name : (str) device name
- value : can be one of the following:
+
1. DbData - several property data to be inserted
2. sequence<DbDatum> - several property data to be inserted
3. dict<str, dict<str, obj>> keys are attribute names and value being another
dictionary which keys are the attribute property names and the value
associated with each key being:
+
3.1 seq<str>
3.2 PyTango.DbDatum
@@ -572,20 +581,21 @@ def __Database__get_class_property(self, class_name, value):
Parameters :
- class_name : (str) class name
- value : can be one of the following:
+
1. str [in] - single property data to be fetched
2. PyTango.DbDatum [in] - single property data to be fetched
3. PyTango.DbData [in,out] - several property data to be fetched
- In this case (direct C++ API) the DbData will be filled with the
- property values
+ In this case (direct C++ API) the DbData will be filled with
+ the property values
4. sequence<str> [in] - several property data to be fetched
5. sequence<DbDatum> [in] - several property data to be fetched
6. dict<str, obj> [in,out] - keys are property names
- In this case the given dict values will be changed to contain the
- several property values
+ In this case the given dict values will be changed to contain
+ the several property values
Return : a dictionary which keys are the property names the value
- associated with each key being a a sequence of strings being the
- property value.
+ associated with each key being a a sequence of strings being the
+ property value.
Throws : ConnectionFailed, CommunicationFailed, DevFailed from device (DB_SQLError)"""
return __Database__generic_get_property(self, class_name, value, self._get_class_property)
@@ -619,15 +629,17 @@ def __Database__delete_class_property(self, class_name, value):
Parameters :
- class_name : (str) class name
- value : can be one of the following:
+
1. str [in] - single property data to be deleted
2. DbDatum [in] - single property data to be deleted
3. DbData [in] - several property data to be deleted
4. sequence<str> [in]- several property data to be deleted
5. sequence<DbDatum> [in] - several property data to be deleted
6. dict<str, obj> [in] - keys are property names to be deleted
- (values are ignored)
+ (values are ignored)
7. dict<str, DbDatum> [in] - several DbDatum.name are property names
- to be deleted (keys are ignored)
+ to be deleted (keys are ignored)
+
Return : None
Throws : ConnectionFailed, CommunicationFailed, DevFailed from device (DB_SQLError)"""
@@ -644,6 +656,7 @@ def __Database__get_class_attribute_property(self, class_name, value):
Parameters :
- class_name : (str) class name
- propnames : can be one of the following:
+
1. str [in] - single attribute properties to be fetched
2. DbDatum [in] - single attribute properties to be fetched
3. DbData [in,out] - several attribute properties to be fetched
@@ -717,11 +730,13 @@ def __Database__put_class_attribute_property(self, class_name, value):
Parameters :
- class_name : (str) class name
- propdata : can be one of the following:
+
1. PyTango.DbData - several property data to be inserted
2. sequence<DbDatum> - several property data to be inserted
3. dict<str, dict<str, obj>> keys are attribute names and value
being another dictionary which keys are the attribute property
names and the value associated with each key being:
+
3.1 seq<str>
3.2 PyTango.DbDatum
@@ -764,11 +779,13 @@ def __Database__delete_class_attribute_property(self, class_name, value):
Parameters :
- class_name : (str) class name
- propnames : can be one of the following:
+
1. DbData [in] - several property data to be deleted
2. sequence<str> [in]- several property data to be deleted
3. sequence<DbDatum> [in] - several property data to be deleted
4. dict<str, seq<str>> keys are attribute names and value being a
list of attribute property names
+
Return : None
Throws : ConnectionFailed, CommunicationFailed
@@ -836,11 +853,14 @@ def __doc_Database():
Database.__doc__ = """
Database is the high level Tango object which contains the link to the static database.
- Database provides methods for all database commands : get_device_property(), put_device_property(), info(), etc..
- To create a Database, use the default constructor.
- Example:
+ Database provides methods for all database commands : get_device_property(),
+ put_device_property(), info(), etc..
+ To create a Database, use the default constructor. Example::
+
db = Database()
- The constructor uses the TANGO_HOST env. variable to determine which instance of the Database to connect to."""
+
+ The constructor uses the TANGO_HOST env. variable to determine which
+ instance of the Database to connect to."""
document_method("write_filedatabase", """
write_filedatabase(self) -> None
@@ -1669,9 +1689,10 @@ def __doc_Database():
wildcard character (eg: 'prop*').
Parameters :
- - devn_ame : (str) device name
+ - dev_name : (str) device name
- attn_ame : (str) attribute name
- prop_name : (str) property name
+
Return : DbHistoryList containing the list of modifications
Throws : ConnectionFailed, CommunicationFailed, DevFailed from device (DB_SQLError)
@@ -1965,28 +1986,31 @@ def __doc_DbDevExportInfo():
DbDevExportInfo.__doc__ = """
import info for a device (should be retrived from the database) with
the following members:
- - name : device name
- - ior : CORBA reference of the device
+
+ - name : (str) device name
+ - ior : (str) CORBA reference of the device
- host : name of the computer hosting the server
- - version : str
+ - version : (str) version
- pid : process identifier"""
def __doc_DbDevImportInfo():
DbDevImportInfo.__doc__ = """
import info for a device (should be retrived from the database) with
the following members:
- - name : device name
+
+ - name : (str) device name
- exported : 1 if device is running, 0 else
- - ior : CORBA reference of the device
- - version : str"""
+ - ior : (str)CORBA reference of the device
+ - version : (str) version"""
def __doc_DbDevInfo():
DbDevInfo.__doc__ = """
A structure containing available information for a device with
the following members:
- - name : str
- - _class : str
- - server : str"""
+
+ - name : (str) name
+ - _class : (str) device class
+ - server : (str) server"""
def __doc_DbHistory():
def document_method(method_name, desc, append=True):
@@ -2044,10 +2068,11 @@ def __doc_DbServerInfo():
DbServerInfo.__doc__ = """
A structure containing available information for a device server with
the following members:
- - name : str
- - host : str
- - mode : str
- - level : str"""
+
+ - name : (str) name
+ - host : (str) host
+ - mode : (str) mode
+ - level : (str) level"""
def init(doc=True):
__init_DbDatum()
diff --git a/PyTango/device_proxy.py b/PyTango/device_proxy.py
index bc2f45b..fbc5124 100644
--- a/PyTango/device_proxy.py
+++ b/PyTango/device_proxy.py
@@ -375,25 +375,26 @@ def __DeviceProxy__delete_property(self, value):
Delete a the given of properties for this device.
This method accepts the following types as value parameter:
- 1. string [in] - single property to be deleted
- 2. PyTango.DbDatum [in] - single property data to be deleted
- 3. PyTango.DbData [in] - several property data to be deleted
- 4. sequence<string> [in]- several property data to be deleted
- 5. sequence<DbDatum> [in] - several property data to be deleted
- 6. dict<str, obj> [in] - keys are property names to be deleted (values are ignored)
- 7. dict<str, DbDatum> [in] - several DbDatum.name are property names to be
- deleted (keys are ignored)
+
+ 1. string [in] - single property to be deleted
+ 2. PyTango.DbDatum [in] - single property data to be deleted
+ 3. PyTango.DbData [in] - several property data to be deleted
+ 4. sequence<string> [in]- several property data to be deleted
+ 5. sequence<DbDatum> [in] - several property data to be deleted
+ 6. dict<str, obj> [in] - keys are property names to be deleted (values are ignored)
+ 7. dict<str, DbDatum> [in] - several DbDatum.name are property names to be deleted (keys are ignored)
Parameters :
- value : can be one of the following:
+
1. string [in] - single property data to be deleted
2. PyTango.DbDatum [in] - single property data to be deleted
3. PyTango.DbData [in] - several property data to be deleted
4. sequence<string> [in]- several property data to be deleted
5. sequence<DbDatum> [in] - several property data to be deleted
6. dict<str, obj> [in] - keys are property names to be deleted (values are ignored)
- 7. dict<str, DbDatum> [in] - several DbDatum.name are property names
- to be deleted (keys are ignored)
+ 7. dict<str, DbDatum> [in] - several DbDatum.name are property names to be deleted (keys are ignored)
+
Return : None
Throws : ConnectionFailed, CommunicationFailed
@@ -1223,6 +1224,7 @@ def __doc_DeviceProxy():
Parameters : None
Return : (sequence<str>) One string for each polled command/attribute.
Each string is multi-line string with:
+
- attribute/command name
- attribute/command polling period in milliseconds
- attribute/command polling ring buffer
diff --git a/PyTango/device_server.py b/PyTango/device_server.py
index 41a669c..2175a8d 100644
--- a/PyTango/device_server.py
+++ b/PyTango/device_server.py
@@ -281,12 +281,11 @@ def __DeviceImpl__add_attribute(self, attr, r_meth=None, w_meth=None, is_allo_me
Parameters :
attr : (Attr) the new attribute to be added to the list.
r_meth : (callable) the read method to be called on a read request
- w_meth : (callable) th write method to be called on a write request (if attr is writable)
- is_allo_meth: (callable) the method that is called to check if it is possible to access
- the attribute or not
-
+ w_meth : (callable) the write method to be called on a write request (if attr is writable)
+ is_allo_meth: (callable) the method that is called to check if it is possible to access the attribute or not
+
Return : None
-
+
Throws : DevFailed"""
att_name = attr.get_name()
@@ -1130,7 +1129,7 @@ def __doc_extra_DeviceImpl(cls):
Write the hardware for attributes.
Default method to implement an action necessary on a device to write
the hardware involved in a a write attribute. This method must be
- redefined in sub-classes in order to support writable attribute
+ redefined in sub-classes in order to support writable attribute
Parameters :
attr_list : (sequence<int>) list of indices in the device object attribute vector
@@ -1434,12 +1433,13 @@ def __doc_Attribute():
document_method("set_value", """
set_value(self, data, dim_x = 1, dim_y = 0) -> None <= DEPRECATED
- set_value(self, data)
+ set_value(self, data) -> None
set_value(self, str_data, data) -> None
Set internal attribute value.
This method stores the attribute read value inside the object.
This method also stores the date when it is called and initializes the attribute quality factor.
+
Parameters :
- data : the data to be set. Data must be compatible with the attribute type and format.
In the DEPRECATED form for SPECTRUM and IMAGE attributes, data
diff --git a/PyTango/exception.py b/PyTango/exception.py
index a743652..27d660e 100644
--- a/PyTango/exception.py
+++ b/PyTango/exception.py
@@ -36,6 +36,7 @@ def __doc_Except():
Except.__doc__ = """
A containner for the static methods:
+
- throw_exception
- re_throw_exception
- print_exception
@@ -98,7 +99,8 @@ def __doc_DevError():
DevError.__doc__ = """
Structure describing any error resulting from a command execution,
or an attribute query, with following members:
- - reason : (str)
+
+ - reason : (str) reason
- severity : (ErrSeverity) error severty (WARN, ERR, PANIC)
- desc : (str) error description
- origin : (str) Tango server method in which the error happened"""
diff --git a/PyTango/group_element.py b/PyTango/group_element.py
index fa844f5..d12fda2 100644
--- a/PyTango/group_element.py
+++ b/PyTango/group_element.py
@@ -190,13 +190,14 @@ def __doc_GroupElement():
Parameters :
- patterns : (str | sequence<str>) A string with the pattern or a
- list of patterns.
+ list of patterns.
- forward : (bool) If fwd is set to true (the default), the remove
- request is also forwarded to subgroups. Otherwise,
- it is only applied to the local set of elements.
- For instance, the following code remove any
- stepper motor in the hierarchy:
- root_group->remove("*/stepper_motor/*");
+ request is also forwarded to subgroups. Otherwise,
+ it is only applied to the local set of elements.
+ For instance, the following code remove any
+ stepper motor in the hierarchy:
+
+ root_group->remove("*/stepper_motor/*");
Return : None
diff --git a/PyTango/pyutil.py b/PyTango/pyutil.py
index 2e198c9..a9b178f 100644
--- a/PyTango/pyutil.py
+++ b/PyTango/pyutil.py
@@ -218,12 +218,10 @@ class Util(_Util):
This class is implemented using the singleton design pattern.
Therefore a device server process can have only one instance of this
- class and its constructor is not public.
-
- Example:
- util = PyTango.Util.instance()
- print util.get_host_name()
- """
+ class and its constructor is not public. Example::
+
+ util = PyTango.Util.instance()
+ print util.get_host_name()"""
def __init__(self, args):
args = copy.copy(args)
@@ -232,11 +230,13 @@ class Util(_Util):
_Util.init_python()
def add_TgClass(self, klass_device_class, klass_device, device_class_name=None):
- """Register a new python tango class.
+ """Register a new python tango class. Example::
- Example:
util.add_TgClass(MotorClass, Motor)
- util.add_TgClass(MotorClass, Motor, 'Motor') # equivalent to previous line"""
+ util.add_TgClass(MotorClass, Motor, 'Motor') # equivalent to previous line
+
+ .. deprecated:: 7.1.2
+ Use :meth:`PyTango.Util.add_class` instead."""
if device_class_name is None:
device_class_name = klass_device.__name__
@@ -247,12 +247,15 @@ class Util(_Util):
"""Register a new C++ tango class.
If there is a shared library file called MotorClass.so which
- contains a MotorClass class and a _create_MotorClass_class method.
- Example:
+ contains a MotorClass class and a _create_MotorClass_class method. Example::
+
util.add_Cpp_TgClass('MotorClass', 'Motor')
- .. note: the parameter 'device_class_name' must match the shared
- library name."""
+ .. note:: the parameter 'device_class_name' must match the shared
+ library name.
+
+ .. deprecated:: 7.1.2
+ Use :meth:`PyTango.Util.add_class` instead."""
cpp_class_list.append((device_class_name, tango_device_class_name))
def add_class(self, *args, **kwargs):
@@ -263,9 +266,8 @@ class Util(_Util):
If language is 'python' then args must be the same as
:meth:`PyTango.Util.add_TgClass`. Otherwise, args should be the ones
- in :meth:`PyTango.Util.add_Cpp_TgClass`.
-
- Example:
+ in :meth:`PyTango.Util.add_Cpp_TgClass`. Example::
+
util.add_class(MotorClass, Motor)
util.add_class('CounterClass', 'Counter', language='c++')
diff --git a/doc/client/group.rst b/doc/client/group.rst
index f86fc6a..025c1dc 100644
--- a/doc/client/group.rst
+++ b/doc/client/group.rst
@@ -23,6 +23,7 @@ GroupReply classes
Group member functions do not return the same as their DeviceProxy counterparts,
but objects that contain them. This is:
+
- *write attribute* family returns PyTango.GroupReplyList
- *read attribute* family returns PyTango.GroupAttrReplyList
- *command inout* family returns PyTango.GroupCmdReplyList
diff --git a/doc/revision.rst b/doc/revision.rst
index 980e0d8..794c945 100644
--- a/doc/revision.rst
+++ b/doc/revision.rst
@@ -66,13 +66,12 @@ Version history
+------------+-------------------------------------------------------------------------------------+
| version | Changes |
+============+=====================================================================================+
-| 7.1.5 | Features: |
+| 7.1.5 | |
| | Bug fixes: |
| | - from sourceforge: |
| | - 3284174: 7.1.4 does not build with gcc 4.5 and tango 7.2.6 |
| | - 3284265: [pytango][7.1.4] a few files without licence and copyright |
| | - 3284318: copyleft vs copyright |
-
+------------+-------------------------------------------------------------------------------------+
| 7.1.4 | Features: |
| | - from sourceforge: |
diff --git a/setup.py b/setup.py
index 15179df..353a4a2 100644
--- a/setup.py
+++ b/setup.py
@@ -261,7 +261,7 @@ else:
# and then uncommenting this line. Someday maybe this will be
# automated...
extra_compile_args += [
-# '-includesrc/precompiled_header.hpp',
+ '-includesrc/precompiled_header.hpp',
]
#if not please_debug:
diff --git a/src/device_info.cpp b/src/device_info.cpp
index f09e36d..28585e0 100644
--- a/src/device_info.cpp
+++ b/src/device_info.cpp
@@ -28,14 +28,7 @@ using namespace boost::python;
void export_device_info()
{
- class_<Tango::DeviceInfo>("DeviceInfo",
- "A structure containing available information for a device with the\n"
- "following members,\n"
- " - dev_class : string\n"
- " - server_id : string\n"
- " - server_host : string\n"
- " - server_version : integer\n"
- " - doc_url : string")
+ class_<Tango::DeviceInfo>("DeviceInfo")
.def_readonly("dev_class", &Tango::DeviceInfo::dev_class)
.def_readonly("server_id", &Tango::DeviceInfo::server_id)
.def_readonly("server_host", &Tango::DeviceInfo::server_host)
diff --git a/src/locker_info.cpp b/src/locker_info.cpp
index adda995..6fd601b 100644
--- a/src/locker_info.cpp
+++ b/src/locker_info.cpp
@@ -30,7 +30,7 @@ struct PyLockerInfo
{
static inline object get_locker_id(Tango::LockerInfo &li)
{
- return (li.ll == Tango::CPP) ?
+ return (li.ll == Tango::CPP) ?
object(li.li.LockerPid) :
tuple(li.li.UUID);
}
@@ -38,16 +38,7 @@ struct PyLockerInfo
void export_locker_info()
{
- class_<Tango::LockerInfo>("LockerInfo",
- "A structure with information about the locker\n"
- "with the folowing members,\n"
- " - ll : (PyTango.LockerLanguage) the locker language\n"
- " - li : (pid_t / UUID) the locker id\n"
- " - locker_host : (string) the host\n"
- " - locker_class : (string) the class\n"
- "\npid_t should be an int, UUID should be a tuple of four numbers.\n"
- "\nNew in PyTango 7.0.0"
- )
+ class_<Tango::LockerInfo>("LockerInfo")
.def_readonly("ll", &Tango::LockerInfo::ll)
.add_property("li", &PyLockerInfo::get_locker_id)
.def_readonly("locker_host", &Tango::LockerInfo::locker_host)
diff --git a/src/periodic_event_info.cpp b/src/periodic_event_info.cpp
index cb0ec79..3d4848d 100644
--- a/src/periodic_event_info.cpp
+++ b/src/periodic_event_info.cpp
@@ -28,12 +28,7 @@ using namespace boost::python;
void export_periodic_event_info()
{
- class_<Tango::PeriodicEventInfo>("PeriodicEventInfo",
- "A structure containing available periodic event information for an attribute\n"
- "with the folowing members,\n"
- " - period : string\n"
- " - extensions : vector of strings\n"
- )
+ class_<Tango::PeriodicEventInfo>("PeriodicEventInfo")
.def_readwrite("period", &Tango::PeriodicEventInfo::period)
.def_readwrite("extensions", &Tango::PeriodicEventInfo::extensions)
;
diff --git a/src/precompiled_header.hpp b/src/precompiled_header.hpp
index bd7faad..1984335 100644
--- a/src/precompiled_header.hpp
+++ b/src/precompiled_header.hpp
@@ -21,8 +21,6 @@
*******************************************************************************/
-#pragma once
-
// These files are really basic, used everywere within the project
// but they take a while (seconds!) to process.
// We don't want to waste those seconds for each cpp file, so we
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pytango.git
More information about the debian-science-commits
mailing list