[pytango] 17/483: fixes #3285185
Sandor Bodo-Merle
sbodomerle-guest at moszumanska.debian.org
Thu Sep 28 19:14:20 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 ce02b7ed07e617a71687c433b822827589d2c7e2
Author: tiagocoutinho <tiagocoutinho at 4e9c00fd-8f2e-0410-aa12-93ce3db5e235>
Date: Wed Apr 13 17:21:18 2011 +0000
fixes #3285185
git-svn-id: http://svn.code.sf.net/p/tango-cs/code/bindings/PyTango/trunk@16562 4e9c00fd-8f2e-0410-aa12-93ce3db5e235
---
PyTango/device_class.py | 14 ++++++--------
PyTango/device_server.py | 6 ++++--
PyTango/release.py | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/PyTango/device_class.py b/PyTango/device_class.py
index c417d36..62344c2 100644
--- a/PyTango/device_class.py
+++ b/PyTango/device_class.py
@@ -286,15 +286,13 @@ class DeviceClass(_DeviceClass):
_DeviceClass.__init__(self,name)
self.dyn_att_added_methods = []
try:
- self.prop_util = PropUtil()
+ pu = self.prop_util = PropUtil()
self.py_dev_list = []
- has_cl_prop = hasattr(self,"class_property_list")
- has_dev_prop = hasattr(self,"device_property_list")
- if has_cl_prop and has_dev_prop:
- self.prop_util.set_default_property_values(self,self.class_property_list, self.device_property_list)
- self.prop_util.get_class_properties(self, self.class_property_list)
- for prop_name in self.class_property_list.keys():
- setattr(self, prop_name, self.prop_util.get_property_values(prop_name, self.class_property_list))
+ pu.set_default_property_values(self, self.class_property_list,
+ self.device_property_list)
+ pu.get_class_properties(self, self.class_property_list)
+ for prop_name in self.class_property_list.keys():
+ setattr(self, prop_name, pu.get_property_values(prop_name, self.class_property_list))
except DevFailed, df:
print("PyDS: %s: A Tango error occured in the constructor:" % name)
Except.print_exception(df)
diff --git a/PyTango/device_server.py b/PyTango/device_server.py
index 314e9bc..792dfed 100644
--- a/PyTango/device_server.py
+++ b/PyTango/device_server.py
@@ -260,10 +260,12 @@ def __DeviceImpl__get_device_properties(self, ds_class = None):
except:
return
try:
- self.prop_util = ds_class.prop_util
+ pu = self.prop_util = ds_class.prop_util
self.device_property_list = copy.deepcopy(ds_class.device_property_list)
class_prop = ds_class.class_property_list
- self.prop_util.get_device_properties(self, class_prop, self.device_property_list)
+ pu.get_device_properties(self, class_prop, self.device_property_list)
+ for prop_name in class_prop.keys():
+ setattr(self, prop_name, pu.get_property_values(prop_name, class_prop))
for prop_name in self.device_property_list.keys():
setattr(self, prop_name, self.prop_util.get_property_values(prop_name, self.device_property_list))
except _PyTango.DevFailed, e:
diff --git a/PyTango/release.py b/PyTango/release.py
index 076d4aa..522c9d0 100644
--- a/PyTango/release.py
+++ b/PyTango/release.py
@@ -47,7 +47,7 @@ class Release:
- keywords : (seq<str>) list of keywords
- licence : (str) the licence"""
name = 'PyTango'
- version_info = (7, 1, 5, 'dev', 0)
+ version_info = (7, 1, 5, 'final', 0)
version = '.'.join(map(str, version_info[:3]))
version_long = version + ''.join(map(str, version_info[3:]))
version_description = 'This version implements the C++ Tango 7.1 API.'
--
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