[openrtm-commit:02124] r746 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-11-18 19:29:49 +0900 (Fri, 18 Nov 2016)
New Revision: 746

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_SeqUtil.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeMeasure.py
Log:
[compat,bugfix,->RELENG_1_2] fixed bug.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_SeqUtil.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_SeqUtil.py	2016-11-18 07:23:23 UTC (rev 745)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/CORBA_SeqUtil.py	2016-11-18 10:29:49 UTC (rev 746)
@@ -160,7 +160,7 @@
 # @endif
 def insert(seq, elem, index):
   len_ = len(seq)
-  if index > len:
+  if index > len_:
     seq.append(elem)
     return
   seq.insert(index, elem)

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py	2016-11-18 07:23:23 UTC (rev 745)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ConfigAdmin.py	2016-11-18 10:29:49 UTC (rev 746)
@@ -889,11 +889,12 @@
   # @param config_id ID of the target configuration set for getting
   #
   # @return The configuration set
-  # 
+  #
   # @endif
   # const coil::Properties& getConfigurationSet(const char* config_id);
   def getConfigurationSet(self, config_id):
-    prop = self._configsets.getNode(config_id)
+    
+    prop = self._configsets.findNode(config_id)
     if prop is None:
       return self._emptyconf
     return prop

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2016-11-18 07:23:23 UTC (rev 745)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/RTObject.py	2016-11-18 10:29:49 UTC (rev 746)
@@ -4768,11 +4768,12 @@
       # EC name specified
       #self._rtcout.RTC_DEBUG("size: %d, name: %s",
       #                       (len(type_and_name_), type_and_name_[1]))
-
+      
       if len(type_and_name_) == 2 and type_and_name_[1][len(type_and_name_[1]) - 1] == ')':
-        del type_and_name_[1][len(type_and_name_[1]) - 1]
+        type_and_name_ = type_and_name_[1][:-1]
         p_.setProperty("name", type_and_name_[1])
-        p_name_ = self._properties.findNode("ec." + p.getProperty("name"))
+        p_name_ = self._properties.findNode("ec." + p_.getProperty("name"))
+        
         if p_name_:
           self._rtcout.RTC_DEBUG("p_name props:")
           self._rtcout.RTC_DEBUG(p_name_)

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeMeasure.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeMeasure.py	2016-11-18 07:23:23 UTC (rev 745)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/TimeMeasure.py	2016-11-18 10:29:49 UTC (rev 746)
@@ -248,7 +248,7 @@
       return len(self._record)
     else:
       return self._count
-    return
+
     
   ##
   # @brief Get total statistics.