[pytango] 45/98: fix for `get_device_attribute_property2`: if prop_attr is not None, it seems it is a dictionary and '.iteritems()' was missing in for loop

[Sandor Bodo-Merle]

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

sbodomerle-guest pushed a commit to tag v9.2.0
in repository pytango.

commit f0dc8459a91cc7343aa613b4a0fb5174b5fee8aa
Author: blissadm <ohlsson at esrf.fr>
Date:   Wed Jun 1 13:29:20 2016 +0200

    fix for `get_device_attribute_property2`: if prop_attr is not None, it
    seems it is a dictionary and '.iteritems()' was missing in for loop
---
 src/boost/python/databaseds/db_access/beacon.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/boost/python/databaseds/db_access/beacon.py b/src/boost/python/databaseds/db_access/beacon.py
index c8002da..3b0ae75 100644
--- a/src/boost/python/databaseds/db_access/beacon.py
+++ b/src/boost/python/databaseds/db_access/beacon.py
@@ -455,6 +455,7 @@ class beacon(object):
                               [str(x) for p in prop_attr.iteritems() for x in p])
         return result  
 
+    @_info
     def get_device_attribute_property2(self, dev_name, attributes):
         prop_attr_device_handler = self._get_property_attr_device(dev_name)
         result = [dev_name, str(len(attributes))]
@@ -465,7 +466,7 @@ class beacon(object):
                 result.extend((attr_name,'0'))
             else:
                 result.extend((attr_name,str(len(prop_attr))))
-                for name,values in prop_attr:
+                for name,values in prop_attr.iteritems():
                     if isinstance(values,list):
                         result.extend([name,len(values)] + [str(x) for x in values])
                     else:

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