[openrtm-commit:02859] r881 - branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-10-06 15:17:12 +0900 (Fri, 06 Oct 2017)
New Revision: 881

Modified:
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Async.py
   branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
Log:
[merge] r870-871,873 have been merged from trunk.

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Async.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Async.py	2017-10-03 01:47:57 UTC (rev 880)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Async.py	2017-10-06 06:17:12 UTC (rev 881)
@@ -43,7 +43,7 @@
 
   def svc(self):
     if len(self._args) > 0:
-      self._func(self._obj, self._args)
+      self._func(self._obj, *self._args)
     else:
       self._func(self._obj)
 
@@ -72,7 +72,7 @@
 
   def svc(self):
     if len(self._args) > 0:
-      self._func(self._obj, self._args)
+      self._func(self._obj, *self._args)
     else:
       self._func(self._obj)
 

Modified: branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Manager.py
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-10-03 01:47:57 UTC (rev 880)
+++ branches/RELENG_1_2/OpenRTM-aist-Python/OpenRTM_aist/Manager.py	2017-10-06 06:17:12 UTC (rev 881)
@@ -471,8 +471,9 @@
       self._initProc(self)
 
     self.initPreCreation()
+    
+    self.initPreConnection()
     self.initPreActivation()
-    self.initPreConnection()
 
     return True
 
@@ -563,6 +564,8 @@
   def load(self, fname, initfunc):
     self._rtcout.RTC_TRACE("Manager.load(fname = %s, initfunc = %s)",
                            (fname, initfunc))
+    fname = fname.replace("/", os.sep)
+    fname = fname.replace("\\", os.sep)
     self._listeners.module_.preLoad(fname, initfunc)
     try:
       fname_ = fname.split(os.sep)