[openrtm-commit:03081] r917 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-01-19 15:17:59 +0900 (Fri, 19 Jan 2018)
New Revision: 917

Modified:
   trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
   trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py
Log:
[compat,bugfix,->RELENG_1_2] fixed bug.

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2018-01-19 06:06:39 UTC (rev 916)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2018-01-19 06:17:59 UTC (rev 917)
@@ -3072,7 +3072,7 @@
   # @if jp
   # @brief µ¯Æ°»þ¤Ërtc.conf¤Ç»ØÄꤷ¤¿¥Ý¡¼¥È¤òÀܳ¤¹¤ë
   # Îã:
-  # manager.components.preconnect: RTC0.port0:RTC0.port1(interface_type=corba_cdr&dataflow_type=pull&~),~
+  # manager.components.preconnect: RTC0.port0^RTC0.port1(interface_type=corba_cdr&dataflow_type=pull&~),~
   # @param self
   # @else
   #
@@ -3098,15 +3098,12 @@
       comp_ports = conn_prop[0].split("^")
       if len(comp_ports) != 2:
         self._rtcout.RTC_ERROR("Invalid format for pre-connection.")
-        self._rtcout.RTC_ERROR("Format must be Comp0.port0:Comp1.port1()")
+        self._rtcout.RTC_ERROR("Format must be Comp0.port0^Comp1.port1()")
         continue
       
       tmp = comp_ports[0].split(".")
-      comp0_name = ""
-      for i in range(0,len(tmp)-1):
-        comp0_name = comp0_name + tmp[i]
-        if i != len(tmp)-2:
-          comp0_name = comp0_name + "."
+      tmp.pop()
+      comp0_name = OpenRTM_aist.flatten(tmp,".")
       
       
       port0_name = comp_ports[0]
@@ -3135,11 +3132,8 @@
         continue
       
       tmp = comp_ports[1].split(".")
-      comp1_name = ""
-      for i in range(0,len(tmp)-1):
-        comp1_name = comp1_name + tmp[i]
-        if i != len(tmp)-2:
-          comp1_name = comp1_name + "."
+      tmp.pop()
+      comp1_name = OpenRTM_aist.flatten(tmp,".")
       port1_name = comp_ports[1]
       
       

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py	2018-01-19 06:06:39 UTC (rev 916)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/NamingManager.py	2018-01-19 06:17:59 UTC (rev 917)
@@ -347,6 +347,8 @@
               obj = cns.resolveStr(rtc_name)
               if CORBA.is_nil(obj):
                 return []
+              if obj._non_existent():
+                return []
               rtc_list.append(obj)
               return rtc_list
           except: