[openrtm-commit:03184] r942 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-02-25 22:32:37 +0900 (Sun, 25 Feb 2018)
New Revision: 942

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

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py	2018-02-25 13:23:22 UTC (rev 941)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ManagerConfig.py	2018-02-25 13:32:37 UTC (rev 942)
@@ -278,10 +278,12 @@
       if opt == "-o":
         pos = arg.find(":")
         if pos > 0:
-          key = [arg[:pos]]
-          value = [arg[pos+1:]]
-          OpenRTM_aist.eraseTailBlank(key)
-          OpenRTM_aist.eraseTailBlank(value)
+          key = arg[:pos]
+          value = arg[pos+1:]
+          key = OpenRTM_aist.unescape(key)
+          key = key.strip()
+          value = OpenRTM_aist.unescape(value)
+          value = value.strip()
           self._argprop.setProperty(key[0],value[0])
 
       if opt == "-p":

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py	2018-02-25 13:23:22 UTC (rev 941)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/Properties.py	2018-02-25 13:32:37 UTC (rev 942)
@@ -781,12 +781,10 @@
       value = []
       self.splitKeyValue(pline, key, value)
       key[0] = OpenRTM_aist.unescape(key[0])
-      OpenRTM_aist.eraseHeadBlank(key)
-      OpenRTM_aist.eraseTailBlank(key)
+      key[0] = key[0].strip()
 
       value[0] = OpenRTM_aist.unescape(value[0])
-      OpenRTM_aist.eraseHeadBlank(value)
-      OpenRTM_aist.eraseTailBlank(value)
+      value[0] = value[0].strip()
 
       self.setProperty(key[0], value[0])
       pline = ""