[openrtm-commit:02147] r760 - trunk/OpenRTM-aist-Python/OpenRTM_aist

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2016-11-28 17:27:05 +0900 (Mon, 28 Nov 2016)
New Revision: 760

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

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ExecutionContextBase.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ExecutionContextBase.py	2016-11-28 05:55:15 UTC (rev 759)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ExecutionContextBase.py	2016-11-28 08:27:05 UTC (rev 760)
@@ -1254,8 +1254,8 @@
   #
   # @endif
   # RTC::ExecutionContextProfile* getProfile(void)
-  def getProfile(self):
-    return self._profile.getProfile()
+  #def getProfile(self):
+  #  return self._profile.getProfile()
 
 
   # end of delegated functions to ExecutionContextProfile

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py	2016-11-28 05:55:15 UTC (rev 759)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/ModuleManager.py	2016-11-28 08:27:05 UTC (rev 760)
@@ -190,7 +190,6 @@
   class NotAllowedOperation(Error):
     def __init__(self, reason_):
       ModuleManager.Error.__init__(self, reason_)
-      ModuleManager.Error.__init__(self, reason_)
 
 
 

Modified: trunk/OpenRTM-aist-Python/OpenRTM_aist/StringUtil.py
===================================================================
--- trunk/OpenRTM-aist-Python/OpenRTM_aist/StringUtil.py	2016-11-28 05:55:15 UTC (rev 759)
+++ trunk/OpenRTM-aist-Python/OpenRTM_aist/StringUtil.py	2016-11-28 08:27:05 UTC (rev 760)
@@ -436,7 +436,7 @@
 def isAbsolutePath(str):
   if str[0] == "/":
     return True
-  if str[0].isalpha() and str[1] == ":" and str[2] == "\\":
+  if str[0].isalpha() and str[1] == ":" and (str[2] == "\\" or str[2] == "/"):
     return True
   if str[0] == "\\" and str[1] == "\\":
     return True